Merge branch 'gl/3.3/comp' into gl/3.3/core
OpenGL 3.3 restoration.