Merge pull request #2931 from github/mbg/fail-build.sh-on-error

Merge pull request #2931 from github/mbg/fail-build.sh-on-error #3468