Update with ba7e921 from Travis CI