Selective pull of upstream code changes / integration work for AudioAddict