Merge remote-tracking branch 'khronos/master' into deqp-dev