Update with 77823f8 from Travis CI