Update with c077a0d from Travis CI