multiple text styles support
Merge branch 'master' into beta