Merge pull request #5475 from UtahDave/develop

Fix module name typo
use locale.get_encoding
add newline for clarity