typographic measure
Merge branch 'master' into modular