Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias