Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:44:05 +0000 (12:44 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:44:05 +0000 (12:44 -0800)

Trivial merge