Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 26 Jul 2018 18:23:01 +0000 (11:23 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 26 Jul 2018 18:23:01 +0000 (11:23 -0700)
Change-Id: Ied47a2d2050599c52a9e08843c342f8e14fef50d


Trivial merge