Update with 5a6e352 from Travis CI