edx/edx-platform — pull request #2955 by raeeschachar (2014-03-17 15:41:47+00:00)
Title: Raees/combined changes

@jzoldak