Merge branch 'fix_diagOp' into 'NIFTy_5'

try to fix DiagonalOperator

See merge request !326
11 jobs for NIFTy_5 in 19 minutes and 5 seconds (queued for 2 seconds)
Scheduled