Update with cdf9080 from Travis CI