Update with 2133afb from Travis CI