Attempt to fix test failure because of anti-aliased tests
Merge remote-tracking branch 'devel/fix_test_failure_text_related' into devel-master