Fix for Travis CI-18