Update with c47bfa5 from Travis CI