Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 2 Oct 2018 23:24:01 +0000 (16:24 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 2 Oct 2018 23:24:01 +0000 (16:24 -0700)
Change-Id: I42a123dd4afcd755487956dd2ff64e8d7e548b60


Trivial merge