Now really fixes Travis

That's what I get for not testing at home
Merge branch 'now-really-fix-travis' into develop