Merge pull request #1701 from jchavanton/rtp_media_server