Merge "ulaw and alaw aren't limited to 8kHz"