Small fix for font rendering
Merge branch 'master' into api