0e5c039536
Fixed lots of (minor) conflicts. Some due to earlier rebasing of material stuff that was subsequently merged into master with a different commit hash (I guess, that's what it looked like anyway).
0e5c039536