Update for media manager
Merge remote-tracking branch 'origin/master' into 1.1
Merge pull request #2 from arryanggaputra/1.1

1.1