Tdavies merge o4 dev 11 01

It's that time again, I've done a merge to the latest O4-dev. I went merge commit by merge commit, and when there were conflicts, I made sure that the diff matched the original merge commit.

I'll run tests shortly