Update with dcd8765 from Travis CI