Get i18n back in sync with master