edx/edx-platform — pull request #2099 by mhoeber (2014-01-07 15:50:13+00:00)
Title: Fixing merge for sylvia's branch bpd-615

Fixing merge for sylvia's branch bpd-615