Update with 189daff from Travis CI