Update with b219b34 from Travis CI