Fix
Merge branch 'anton/video_subtitles' of github.com:edx/edx-platform into anton/video_subtitles