Merge branch 'dev/comp-workspaces' into for-chris-4.7-20160525
authorDavid Sterba <dsterba@suse.com>
Wed, 25 May 2016 20:51:04 +0000 (22:51 +0200)
committerDavid Sterba <dsterba@suse.com>
Wed, 25 May 2016 20:51:04 +0000 (22:51 +0200)

Trivial merge