Merge "Move glyphy shaders into separate files" into devel/master