Update with 7c67404 from Travis CI