Update with db06dd4 from Travis CI