Update with 808387e from Travis CI