Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 22:09:13 +0000 (14:09 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 22:09:13 +0000 (14:09 -0800)

Trivial merge