Merge vk-gl-cts/github-master into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Sep 2017 11:22:42 +0000 (13:22 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Sep 2017 11:22:42 +0000 (13:22 +0200)
Change-Id: I1446b5237224f6b26f74dc2d4ea0f17174908888


Trivial merge