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

Rel/3.9.4

See merge request fsl/fslpy!342
3 jobs for 3.9.4 in 3 minutes and 39 seconds (queued for 2 seconds)
latest