Merge branch 'NIFTy_4' into improve_minimization

1 job for improve_minimization in 12 minutes and 24 seconds (queued for 2 seconds)