included l10n fix from master