Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 15 Jun 2018 21:18:19 +0000 (14:18 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 15 Jun 2018 21:18:19 +0000 (14:18 -0700)
Change-Id: I7f11f515a7d9ce3e10b0b90070acb8639da97763


Trivial merge