Keep the original environ
Merge pull request #1 from camptocamp/env

Keep the original environ