edx/edx-platform — pull request #4320 by adampalay (2014-07-07 17:56:19+00:00)
Title: Merge rc to master

#4319 with a resolved merge conflict

@rocha did I resolve the merge conflict correctly?