Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 31 Oct 2017 11:42:33 +0000 (12:42 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 31 Oct 2017 11:42:33 +0000 (12:42 +0100)
Change-Id: I3b667412ed69688048e92d7855ddf85b58364311


Trivial merge