Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 17 Apr 2018 20:51:08 +0000 (13:51 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 17 Apr 2018 20:51:08 +0000 (13:51 -0700)
Change-Id: Ie0f7b6e81907b5b35f9eadf696063d0ec147c168


Trivial merge