Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 6 Jan 2016 21:51:54 +0000 (13:51 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 6 Jan 2016 21:51:54 +0000 (13:51 -0800)

Trivial merge