Merged of dfkeenan's Audio Toolkit Extension