Merge Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:01:34 +0000 (15:01 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:01:34 +0000 (15:01 -0800)

Trivial merge