Merge branch 'glsl2-head' into glsl2