Merge branch 'rel/3.6.1' into 'v3.6'

Rel/3.6.1

See merge request fsl/fslpy!298
3 jobs for 3.6.1 in 1 minute and 20 seconds (queued for 3 seconds)
latest