Advance media
Merge remote-tracking branch 'upstream/master'
 changes to media and events and fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #239 from Rakeshadlagatta/master

Changes to media and events and fixes