Update with c5b7fb8 from Travis CI