Update with 171ca1d from Travis CI