Update with d6f5c4f from Travis CI