Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/models/fields/related.py

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/basic/models.py b/tests/basic/models.py
index 660beddf49..1bffcb9cda 100644
--- a/tests/basic/models.py
+++ b/tests/basic/models.py
@@ -18,3 +18,11 @@ class Article(models.Model):
 
     def __str__(self):
         return self.headline
+
+@python_2_unicode_compatible
+class SelfRef(models.Model):
+    selfref = models.ForeignKey('self', null=True, blank=True,
+                                related_name='+')
+
+    def __str__(self):
+        return SelfRef.objects.get(selfref=self).pk