Brightcove update
Merge remote-tracking branch 'upstream/master'
Brightcove update
Merge pull request #199 from jerv13/master

Brightcove update