edx/edx-platform — pull request #5029 by andy-armstrong (2014-08-29 20:29:48+00:00)
Title: Merge hotfix-2014-08-29 back to master

TNL-178