Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 23:41:10 +0000 (15:41 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 23:41:10 +0000 (15:41 -0800)

Trivial merge