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

Rel/3.6.4

See merge request fsl/fslpy!308
3 jobs for 3.6.4 in 1 minute and 28 seconds (queued for 3 seconds)
latest