edx/edx-platform — pull request #1742 by nedbat (2013-11-21 15:44:26+00:00)
Title: Ned/cherry pick pr 1740

This pulls in PR 1740, which is Don's fix for STUD-979