[sr-dev] git:master:32c363e1: Merge pull request #1701 from jchavanton/rtp_media_server