Fix multiple video bug
Merge pull request #851 from edx/hotfix/release-multiple-video-bug

Hotfix/release multiple video bug
Merge branch 'release' into edx-west/release-candidate-20130903