Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 12 Sep 2018 21:39:13 +0000 (14:39 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 12 Sep 2018 21:55:06 +0000 (21:55 +0000)
Change-Id: Ide0cc071921295090980b85e5807ba31791d4bab


Trivial merge