Merge changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Mon, 23 Nov 2015 23:23:52 +0000 (15:23 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 23 Nov 2015 23:23:52 +0000 (15:23 -0800)

Trivial merge