edx/edx-platform — pull request #4319 by adampalay (2014-07-07 17:50:06+00:00)
Title: Rc/2014 07 02

merge changes made onto last week's rc back into master
@wedaly @rocha