edx/edx-platform — pull request #4312 by lamagnifica (2014-07-07 13:26:13+00:00)
Title: Edits from Michele

@mslotkeEDX , please take a look.