Merge pull request #10143 from nupplaphil/bug/fix_l10n