Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 15 May 2018 15:57:53 +0000 (08:57 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 15 May 2018 15:57:53 +0000 (08:57 -0700)
Change-Id: Ic7f1d3a9f9c59e23a51193eb616e62e638280877


Trivial merge