Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 3 Jul 2018 18:06:16 +0000 (11:06 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 3 Jul 2018 18:06:16 +0000 (11:06 -0700)
Change-Id: I2b4f4875da8ed35ec419db23dcacfc30751eae48


Trivial merge