Merge branch 'sb/gpg-i18n'