Merge branch 'rc' into release

Installed on 2014/07/14
Merge branch 'release' into old-master-probably

Conflicts:
	requirements/edx/base.txt
    (taking requests==2.3.0 in preference to 1.2.3,
     requests-oauthlib==0.4.0 in preference to 0.4.1)