Auto-Merge pull request #3138 from mkauf/fix_exec_environment