scaling fonts
Merge origin/master