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

Rel/3.6.2

See merge request fsl/fslpy!300
3 jobs for 3.6.2 in 1 minute and 23 seconds (queued for 2 seconds)
latest