Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 17:50:23 +0000 (09:50 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 17:50:23 +0000 (09:50 -0800)

Trivial merge