fix bug font
Merge branch 'master' into KENTIN