text-decoration, font-weight, font-style, hyphens, text-align settings
Merge branch 'master' into nook
resources cleanup
Merge branch 'master' into nook