Issue #6815: os.path.expandvars() now supports non-ASCII environment
variables names and values.
Fixed typo in previous commit (issue #6815).