Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 19 Jan 2018 10:29:40 +0000 (11:29 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 19 Jan 2018 10:29:40 +0000 (11:29 +0100)
Change-Id: Ifd7bec720796fbd7006b44107d5c76e1c0c5f3d4


Trivial merge