Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 1 Jun 2018 22:28:55 +0000 (15:28 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 1 Jun 2018 22:28:55 +0000 (15:28 -0700)
Change-Id: I20b1d746e5457f356a2ea4511a5051fe8ac4981c


Trivial merge