Merge branch 'NIFTy_7' into flexible_FieldZeroPadder

14 jobs for flexible_FieldZeroPadder in 13 minutes and 40 seconds (queued for 2 seconds)