Merge in the Sample Rate branch.