Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Tue, 15 Dec 2015 23:36:17 +0000 (15:36 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 15 Dec 2015 23:36:17 +0000 (15:36 -0800)

Trivial merge