Merge remote-tracking branch 'work/gettext' into devel