Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 16 Nov 2018 19:32:07 +0000 (11:32 -0800)
committerChris Forbes <chrisforbes@google.com>
Fri, 16 Nov 2018 19:32:07 +0000 (11:32 -0800)
Change-Id: Iccdbde76e6b4282877b4b329cc0f9400c8e334e6


Trivial merge