Merge trivial fix from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 18 Nov 2015 21:58:05 +0000 (13:58 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 18 Nov 2015 21:58:05 +0000 (13:58 -0800)

Trivial merge