Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 7 Aug 2018 15:50:26 +0000 (08:50 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 7 Aug 2018 15:50:26 +0000 (08:50 -0700)
Change-Id: I6183377aa1a154927f42bfb0110c32235498bc37


Trivial merge