Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 16 Dec 2015 18:44:35 +0000 (10:44 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 16 Dec 2015 18:44:35 +0000 (10:44 -0800)

Trivial merge