Merge branch 'rel/2.8.4' into 'v2.8'

Rel/2.8.4

See merge request fsl/fslpy!204
3 jobs for 2.8.4 in 3 minutes and 37 seconds
latest