zsh: Don't let zprofile overwrite stuff set in .zshenv
Merge branch 'master' into glue