Sync changes with master branch
Merge branch 'GLSL' of https://github.com/ymesh/meShaderEd into GLSL