Update with 8e5d37c from Travis CI