Update with 62d3f7b from Travis CI