Update with cfca44f from Travis CI