Update with d40c4da from Travis CI