Merge remote-tracking branch 'freenet/next' into normalize-histograms