Merge branch 'update-l10n' into 'master'