ci-osx.sh imported from travis branch
Merge branch 'travis-osx' into fix-travis-branch