Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 25 May 2018 21:45:41 +0000 (14:45 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 25 May 2018 21:45:41 +0000 (14:45 -0700)
Change-Id: Ie70044b186cd4bd875ffd2c441c0e2f9f92a2dcc


Trivial merge