edx/edx-platform — pull request #3516 by frrrances (2014-04-29 14:28:57+00:00)
Title: Fix for xblock settings scroll

@andy-armstrong can you review this fix for xblock settings scroll (in this case, it's for the ooyala player).
UX-623