Update with 8c26e47 from Travis CI