scc2 changes to mail and glyphs
scc2 changes to glyphs
Minor cleanup of pull request code