Merge branch 'jk/gettext-poison'