Update with e87c0b4 from Travis CI