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

Trivial merge