Merge changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Sat, 12 Dec 2015 00:20:18 +0000 (16:20 -0800)
committerPyry Haulos <phaulos@google.com>
Sat, 12 Dec 2015 00:20:18 +0000 (16:20 -0800)

Trivial merge