Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Sep 2018 09:38:23 +0000 (11:38 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Sep 2018 09:38:23 +0000 (11:38 +0200)
Change-Id: Icd9ba51ef9981d8566fb3d2a1efaa11f0b66af34


Trivial merge