Merge in fixes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 13 Apr 2016 22:19:22 +0000 (15:19 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 13 Apr 2016 22:19:22 +0000 (15:19 -0700)

Trivial merge