Merge remote-tracking branch 'origin/NIFTy_6' into imag_operator

11 jobs for imag_operator in 8 minutes and 22 seconds (queued for 3 seconds)