Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 19 Apr 2018 10:43:57 +0000 (12:43 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 19 Apr 2018 10:43:57 +0000 (12:43 +0200)
Change-Id: If7e1ee91eef8f01552a6dbbb8a3c76950f5a72fc


Trivial merge