Update with 40c3927 from Travis CI