Update with 2e0147f from Travis CI