no longer convolving with pixel twice
Merge remote-tracking branch 'original/master' into im3shape-driver