Merge in changes from Khronos master
authorPyry Haulos <phaulos@google.com>
Mon, 19 Oct 2015 20:59:32 +0000 (13:59 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 19 Oct 2015 20:59:32 +0000 (13:59 -0700)

Trivial merge