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

10 jobs for integration_operator in 8 minutes and 23 seconds (queued for 3 seconds)