Merge vk-gl-cts/github-master into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 27 Feb 2018 11:16:52 +0000 (12:16 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 27 Feb 2018 11:16:52 +0000 (12:16 +0100)
Change-Id: I8990b1e682cdb59cdf15eeddbc91af817b9e3e30


Trivial merge