Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 13 Oct 2017 07:24:45 +0000 (09:24 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 13 Oct 2017 07:24:45 +0000 (09:24 +0200)
Change-Id: I1633067088bf47e3b50ad4a9202351954b5ba38e


Trivial merge