edx/edx-platform — pull request #5735 by wedaly (2014-10-27 15:06:01+00:00)
Title: Merge release into master (with changes from Friday 10/24/14)

@rlucioni Looks okay?

FYI: @martynjames I'm going to merge this as soon as tests pass in Jenkins, at which point you'll be able to cut the RC.