Make travis-ci build pass