Merge branch 'glsl-1.20-v2'