add some debugging for environmeng vars
Merge branch 'master' into production