Merge branch 'NIFTy_7' into more_derivatives

12 jobs for more_derivatives in 12 minutes and 24 seconds (queued for 3 seconds)