Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 20 Jun 2018 18:01:27 +0000 (11:01 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 20 Jun 2018 18:01:27 +0000 (11:01 -0700)
Change-Id: Ib92c7970331e8a0512b1a02af5d501525f68adc9


Trivial merge