merge of glsl-compiler-1 branch