hoping this fixes the issue with fonts
Merge branch 'master' into authenticate