Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 25 Aug 2017 14:20:15 +0000 (16:20 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 25 Aug 2017 14:20:15 +0000 (16:20 +0200)
Change-Id: I189d8d9c5dcf45b026fb82f6771e82e83b2f25b7


Trivial merge