Fixed issues with font size influences in the text position calculator. Tests have not yet been fixed to relect.
Merge remote-tracking branch 'origin/master'