Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 12 Jan 2018 16:19:55 +0000 (17:19 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 12 Jan 2018 16:19:55 +0000 (17:19 +0100)
Change-Id: Iace4a50e10d78067beecb94411081c10e9cef548


Trivial merge