Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 6 Jun 2018 22:33:36 +0000 (15:33 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 6 Jun 2018 22:33:36 +0000 (15:33 -0700)
Change-Id: Iff417713f1d7afa0a4475b455054e49192b6ead2


Trivial merge