Update with 17e5172 from Travis CI