Merge pull request #1725 from CircleCI-Public/install.sh-compat