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

10 jobs for testing_operators_ve in 8 minutes and 28 seconds (queued for 3 seconds)