Merge "Make bash shebangs through /usr/bin/env"