fix path to font resources
Merge branch 'master' into 2.3