Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 6 Jul 2018 22:00:13 +0000 (15:00 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 6 Jul 2018 22:00:13 +0000 (15:00 -0700)
Change-Id: Ic89c9892ac27df09c6246f5f86a9013d6c0ea59f


Trivial merge