Glyph Layering
Merge branch 'master' into z-index