Merge back from develop

Holy crap an actual OpenGL fix