Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 22 Sep 2017 15:41:54 +0000 (10:41 -0500)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 22 Sep 2017 15:41:54 +0000 (10:41 -0500)
Change-Id: I3c3e21f7def0b5dac25ac6618f7971ced5a1c238


Trivial merge