checkpoint/tag master before merging in glsl-compiler-1 branch