Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 30 Aug 2018 11:51:17 +0000 (13:51 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 30 Aug 2018 11:51:17 +0000 (13:51 +0200)
Change-Id: If1364c4c47fb23716fee1c7f7a28ba10dec350be


Trivial merge