Merge branch 'rel/2.6.0' into 'v2.6'

Rel/2.6.0

See merge request fsl/fslpy!162
3 jobs for 2.6.0 in 1 minute and 34 seconds (queued for 3 seconds)
latest