Merge in bugfixes from Khronos repository