Update with de48ed8 from Travis CI