Fix for broken (travis-ci) build