Merge from upstream (i18n fixes)