Merge branch 'sg/travis-osx-brew-breakage-workaround'