Merge branch 'NIFTy_5' into normalized_amplitudes

9 jobs for normalized_amplitudes in 8 minutes and 30 seconds (queued for 3 seconds)