Update with b6ca996 from Travis CI