Merge in changes from Khronos repository