Update with 570482a from Travis CI