Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 29 Mar 2018 20:27:19 +0000 (13:27 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 29 Mar 2018 20:27:19 +0000 (13:27 -0700)
Change-Id: I93f0ba87fc282346c4d7bd6b4521b105826328aa


Trivial merge