[WIP] 3.0 travis long shot

A few commits in the hope travis will like them