Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Tue, 12 Jan 2016 03:51:04 +0000 (19:51 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 12 Jan 2016 03:51:04 +0000 (19:51 -0800)

Trivial merge