Merge pull request #1 from anderssewerinhi/fixfontunittest

Fix for unit test on Mac
Merged the remote upstream master into mine.

Merge remote-tracking branch 'upstream/master'