Merge branch 'MediaPlayerFeatures'
Merge branch 'master' into MediaPlayerFeatures