Update with ebdacb4 from Travis CI