Merge pull request #17831 from edx/release-mergeback-to-master

Merge release back to master

common/djangoapps/course_modes/migrations/0011_change_regex_for_comma_separated_ints.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-30 17:38
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+import re
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course_modes', '0010_archived_suggested_prices_to_charfield'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='coursemode',
+            name='suggested_prices',
+            field=models.CharField(blank=True, default=b'', max_length=255, validators=[django.core.validators.RegexValidator(re.compile('^\d+(?:\,\d+)*\Z'), code='invalid', message='Enter only digits separated by commas.')]),
+        ),
+        migrations.AlterField(
+            model_name='coursemodesarchive',
+            name='suggested_prices',
+            field=models.CharField(blank=True, default=b'', max_length=255, validators=[django.core.validators.RegexValidator(re.compile('^\d+(?:\,\d+)*\Z'), code='invalid', message='Enter only digits separated by commas.')]),
+        ),
+    ]

common/djangoapps/third_party_auth/migrations/0017_remove_icon_class_image_secondary_fields.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-30 17:38
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('third_party_auth', '0016_auto_20180130_0938'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ltiproviderconfig',
+            name='icon_class',
+        ),
+        migrations.RemoveField(
+            model_name='ltiproviderconfig',
+            name='icon_image',
+        ),
+        migrations.RemoveField(
+            model_name='ltiproviderconfig',
+            name='secondary',
+        ),
+    ]

lms/djangoapps/certificates/migrations/0014_change_eligible_certs_manager.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-30 17:38
+from __future__ import unicode_literals
+
+from django.db import migrations
+import django.db.models.manager
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('certificates', '0013_remove_certificategenerationcoursesetting_enabled'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='generatedcertificate',
+            managers=[
+                ('eligible_certificates', django.db.models.manager.Manager()),
+            ],
+        ),
+    ]

requirements/edx/django.txt

-Django==1.8.19
+Django==1.11.11