Only add LANG to the environment if it's in the main environment
Merge branch 'master' of github.com:conda/conda-build
Merge branch 'master' into rpath