Merge branch 'origin' into glsl-compiler-1