Merged VoIP+TcpIP+master(on Nov. 8)

Merge operation by C4Phone.