Fixes text height calculations for iOS 8
Merge branch 'fix/text-height-calculations' into develop

* fix/text-height-calculations:
  Fixes text height calculations for iOS 8