Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 10 Oct 2018 22:10:54 +0000 (15:10 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 10 Oct 2018 22:10:54 +0000 (15:10 -0700)
Change-Id: Ie41fa6cb58a683045ac3aa277b5370a0f5cf2cf4


Trivial merge