edx/edx-platform — pull request #1906 by adampalay (2013-12-10 15:42:29+00:00)
Title: Hotfix/2013 12 10

hotfix branch to replace #1905 and #1902