Merge pull request #3203 from taxigps/fonts