Update with 1fb7919 from Travis CI