edx/edx-platform — pull request #5818 by martynjames (2014-10-31 17:43:41+00:00)
Title: Release

Merge hotfix patches through to master