Merge remote-tracking branch 'origin/encounters-i18n'