Merge pull request #838 from expa/mh-build-env-special-chars

quote build_env vars