edx/edx-platform — pull request #1960 by e0d (2013-12-16 15:30:42+00:00)
Title: E0d/release merge

@jarv @polesye @dmitchell @jzoldak

Please review this updated PR and new branch. If things look good, I'll merge to master and create the release branch.