Update with de9feb5 from Travis CI