Update with d9d5cd4 from Travis CI