Update with 6b3cc5b from Travis CI