Merge pull request #12031 from edx/rc-merge-test

Merge RC back into master.

lms/djangoapps/ccx/migrations/0003_add_master_course_staff_in_ccx.py

@@ -64,6 +64,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('ccx', '0001_initial'),
         ('ccx', '0002_customcourseforedx_structure_json'),
+        ('course_overviews','0010_auto_20160329_2317'), # because we use course overview and are in the same release as that table is modified
     ]
 
     operations = [