Merge branch 'jc/no-need-for-env-in-sh-scripts'