don't check for GL_KHR_debug first
Merge branch 'master' into ecs-conversion