Merge vk-gl-cts/github-master into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 28 Sep 2018 11:31:03 +0000 (13:31 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 28 Sep 2018 11:31:03 +0000 (13:31 +0200)
Change-Id: I3331377694e584a665508c3b8ef66cb3c6cea9d3


Trivial merge