Update with f09af20 from Travis CI