Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 6 Mar 2018 00:00:45 +0000 (16:00 -0800)
committerChris Forbes <chrisforbes@google.com>
Tue, 6 Mar 2018 00:00:45 +0000 (16:00 -0800)
Change-Id: I3a70f61143bc2f7f2b1e3ad51a6179a776b6dfcc


Trivial merge