Update with 9733419 from Travis CI