Restoring font-size
About to upgrade to 7.24
Updated to 7.24
Need to merge.
Merging
Merge branch 'develop'