Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 8 Jun 2018 21:04:31 +0000 (14:04 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 8 Jun 2018 21:04:31 +0000 (14:04 -0700)
Change-Id: Ie16f55b158e9e677980fdd83783ab176d1f9eaa5


Trivial merge