Update with e4aa554 from Travis CI