Note that following !86 (merged) other merges from O4-dev, we shouldn't squash commits on merges from other long-lived branches (yet another reason to avoid long lived branches).
I've also caught back up to O4-dev. There's a fair few changes, and warnings that weren't in O4-dev, but those can be addressed separately.
Test run here: /fred/oz996/tdavies/spiir_project/sources/testing/gout/py3/MR84_tests
Edited by Timothy Davies