Improved Travis CI compatibility