Merge changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 27 Jan 2016 23:38:44 +0000 (15:38 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 27 Jan 2016 23:38:44 +0000 (15:38 -0800)

Trivial merge