Merge branch 'master' into glsl2