edx/edx-platform — pull request #5400 by adampalay (2014-09-25 21:36:39+00:00)
Title: Merge conflicts release

@lduarte1991, there were merge conflicts merging release into master. Does this look ok?