Update with 53b5cfa from Travis CI