Merge branch 'qa/out_of_source_build' of gitlab.cosma.dur.ac.uk:swift/swiftsim into qa/out_of_source_build Conflicts: tests/testReading.c