Merge vk-gl-cts/master into vk-gl-cts-public/master
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 13 Jul 2017 11:09:24 +0000 (13:09 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 13 Jul 2017 11:09:24 +0000 (13:09 +0200)
Change-Id: I534c0fe4b0c99281ac8f712ec16f66c5db9596ee


Trivial merge