WIP: try to make travis-ci build pass