Update with f0cbc8d from Travis CI