Merge branch 'mnt/v3.3/recover' into 'v3.3'

Mnt/v3.3/recover

See merge request fsl/fslpy!259
14 jobs for v3.3 in 77 minutes and 11 seconds (queued for 1 second)
latest
Name Stage Failure
failed
test:3.8 Test
tests/test_imagewrapper.py::test_ImageWrapper_write_out_threaded PASSED  [ 71%]
tests/test_imagewrapper.py::test_ImageWrapper_write_out_unthreaded PASSED [ 75%]
tests/test_imagewrapper.py::test_ImageWrapper_write_in_overlap_threaded PASSED [ 78%]
tests/test_imagewrapper.py::test_ImageWrapper_write_in_overlap_unthreaded PASSED [ 82%]
tests/test_imagewrapper.py::test_ImageWrapper_write_different_volume_threaded PASSED [ 85%]
tests/test_imagewrapper.py::test_ImageWrapper_write_different_volume_unthreaded PASSED [ 89%]
tests/test_scripts/test_atlasq_ohi.py::test_coords PASSED [ 92%]
tests/test_scripts/test_atlasq_ohi.py::test_mask ./.ci/test_template.sh: line 67: 5765 Killed python setup.py test --addopts="$TEST_OPTS -m 'longtest'"
ERROR: Job failed: exit code 1