Merge branch 'NIFTy_6' into timing_helpers

9 jobs for timing_helpers in 9 minutes and 51 seconds (queued for 2 seconds)