Merge branch 'master' into vlad
Add -advertiseMedia: stub
Merge pull request #9 from Gatzy118/vlad

Add -advertiseMedia: