edx/edx-platform — pull request #6291 by adampalay (2014-12-17 15:57:34+00:00)
Title: Hotfix/2014 12 17

@symbolist
@jmclaus
@fredsmith