Mac font modification extended.
Merge remote branch 'upstream/master'