Merge "this should fix the GL debugger"