Update with b636047 from Travis CI