Merge branch 'mnt/recover' into 'master'

Mnt/recover

See merge request fsl/fslpy!258
7 jobs for master in 17 minutes and 45 seconds (queued for 1 second)