Merge pull request #4621 from alexanderkyte/strdup_env