Merge branch 'jc/gettext-test-fix'