Fix error in convolution and rebin

Merged Paul Zakalek requested to merge wip into master

Merge request reports