Fix #833 by limiting Windows shell_env support to local() only.

Also fixes changelog to note that the original #804 was considered a bugfix, not a feature, since it is in the 1.5 branch
Merge branch '1.5'