only more glyph
Merge branch 'master' into authenticate