Replace magic #env with #setEnv and #getEnv.
Merge in latest master
Bump docs.