Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 28 Jan 2016 01:33:42 +0000 (17:33 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 28 Jan 2016 01:33:42 +0000 (17:33 -0800)

Trivial merge