Update with 8763395 from Travis CI