Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 17 May 2018 17:00:15 +0000 (10:00 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 17 May 2018 17:00:15 +0000 (10:00 -0700)
Change-Id: I895c6d9ec918a2c89ec28df2ca75fbecb0adaaa1


Trivial merge