Update with 9fe2be0 from Travis CI