Merge fixes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 3 Dec 2015 21:31:54 +0000 (13:31 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 3 Dec 2015 21:31:54 +0000 (13:31 -0800)

Trivial merge