Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Mon, 22 Oct 2018 20:34:57 +0000 (13:34 -0700)
committerChris Forbes <chrisforbes@google.com>
Mon, 22 Oct 2018 20:34:57 +0000 (13:34 -0700)
Change-Id: I48514e0cc76b19c8ed0ba4845c5f0617c0e15b9a


Trivial merge