Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev
am: c5ce69f555

* commit 'c5ce69f555ce703a0bd1d7438e1b87ee9854eae8':
  Fixed a bug where the font sizes where not enforced correctly