Merge from julik/glsl-shaders; isssue #464.