Merge pull request #3324 from GJRobert/nan-l10n