Merge changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 30 Sep 2015 17:47:13 +0000 (10:47 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 30 Sep 2015 17:47:13 +0000 (10:47 -0700)

Trivial merge