Update with d6bd0b9 from Travis CI