Merge pull request #4645 from daverodgman/travis-disable-osx-2.16

Backport 2.16: Disable OS X Travis builds