Merge branch 'sg/travis-build-during-script-phase'