Merge branch 'dstftw-compat-getenv-and-expanduser'