Merge pull request #7691 from ryandesign/use-PYTHON-env-var