merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling...