Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 27 Jul 2018 16:33:15 +0000 (09:33 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 27 Jul 2018 16:33:15 +0000 (09:33 -0700)
Change-Id: Ie2f5d01b30f9c10b0081b4d784d3c6fcbb72eb63


Trivial merge