Merge pull request #110 from travis-ci/hh-pull-osx-production

Merge changes from osx-production
Merge branch 'master' into staging