Merge latest O4 dev into Bypass
Bypass fell a little behind O4-dev, but not as much as I'd thought. Most changes went without a merge conflict, and most of those didn't require any special changes.
Gaps in Postcoh were changed a little, but Bypass' tracks gaps much more simply, so I didn't see anywhere that I needed to make the same change.
Builds successfully, I haven't run tests though.