Update with c8b12e8 from Travis CI