Work in progress: Fix Travis-CI