google fonts
minor fixes
Merge branch 'master' into HEAD