Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 20 Oct 2017 10:49:08 +0000 (12:49 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 20 Oct 2017 10:49:08 +0000 (12:49 +0200)
Change-Id: I92e28dc57ffab7e704338d241533b0ab1505015c


Trivial merge