Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 20 Jul 2018 16:42:17 +0000 (09:42 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 20 Jul 2018 16:42:17 +0000 (09:42 -0700)
Change-Id: Id3c4bfc8862ff4d36b40ea9fc91fd5441b0e6ba9


Trivial merge