Ugly fix for font problems
Merge branch 'develop'