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

Trivial merge