Merge vk-gl-cts/master into vk-gl-cts/opengl-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Sun, 16 Jul 2017 14:55:03 +0000 (16:55 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Sun, 16 Jul 2017 14:55:03 +0000 (16:55 +0200)
Change-Id: I4276dcb10f06378d5b71646d956bd8fc6e4615d0


Trivial merge