Merge branch 'mnt/3.6.0-prep' into 'master'

Mnt/3.6.0 prep

See merge request fsl/fslpy!294
5 jobs for master in 30 seconds (queued for 1 second)