Merge "Fix reverb at 48kHz" into jb-mr2-dev