Selective pull of upstream code changes / integration work for AudioAddict

weird that they used mediumint