Merge branch 'master' into GLSL-master the only commit on master is to fix vertexloader, so disable jit for osx
