Merge branch 'fontsizechanges'