Update with 557425e from Travis CI