Merge branch 'release-candidate' into release

common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_comment_common', '0003_enable_forums'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='forumsconfig',
+            name='connection_timeout',
+            field=models.FloatField(default=5.0, help_text=b'Seconds to wait when trying to connect to the comment service.'),
+        ),
+    ]

common/djangoapps/student/migrations/0008_auto_20161117_1209.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('student', '0007_registrationcookieconfiguration'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='level_of_education',
+            field=models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[(b'p', b'Doctorate'), (b'm', b"Master's or professional degree"), (b'b', b"Bachelor's degree"), (b'a', b'Associate degree'), (b'hs', b'Secondary/high school'), (b'jhs', b'Junior secondary/junior high/middle school'), (b'el', b'Elementary/primary school'), (b'none', b'No formal education'), (b'other', b'Other education')]),
+        ),
+    ]

requirements/edx/base.txt

@@ -10,7 +10,7 @@ bleach==1.4
 html5lib==0.999
 boto==2.39.0
 celery==3.1.18
-cryptography==1.3.1
+cryptography==1.5.3
 cssselect==0.9.1
 dealer==2.0.4
 defusedxml==0.4.1