Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 6 Sep 2017 13:40:56 +0000 (15:40 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 6 Sep 2017 13:40:56 +0000 (15:40 +0200)
Change-Id: I61a6ffc581f10ec14c27cb06363daf85b00c8983


Trivial merge