Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 9 Dec 2015 20:51:12 +0000 (12:51 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 9 Dec 2015 20:51:12 +0000 (12:51 -0800)

Trivial merge