Merge remote-tracking branch 'origin/NIFTy_5' into reprs

9 jobs for reprs in 9 minutes and 29 seconds (queued for 2 seconds)