Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 27 Nov 2018 16:34:31 +0000 (08:34 -0800)
committerChris Forbes <chrisforbes@google.com>
Tue, 27 Nov 2018 16:34:57 +0000 (08:34 -0800)
Change-Id: I3eed3a763d361dec4f081c85c18263676e58f912


Trivial merge