Merge branch 'rel/3.9.6' into 'v3.9'

Rel/3.9.6

See merge request fsl/fslpy!347
7 jobs for v3.9 in 98 minutes and 45 seconds (queued for 4 seconds)
latest