Merge vk-gl-cts/github-master into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 5 Oct 2018 08:09:33 +0000 (10:09 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 5 Oct 2018 08:09:33 +0000 (10:09 +0200)
Change-Id: I482a9e520b06d5af5620c486b6faf0eec9d76775


Trivial merge