Merge branch 'resampler'