edx/edx-platform — pull request #4701 by adampalay (2014-08-05 17:25:28+00:00)
Title: Adam/usman hotfix with fixed video tests

@jzoldak , making this PR for the sake of running tests