Merge pull request #3308 from rubenk/travis-osx