Merged r11401:11405 from jblum/digital into trunk. Restores tunnel.py, rx_voice...