Try to fix Travis build

This pull request **IS NOT** ready yet. I'm using it to test Travis builds.