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

Conflicts:
	django/db/backends/__init__.py
	django/db/models/fields/related.py
	tests/field_deconstruction/tests.py

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/foreign_object/models.py b/tests/foreign_object/models.py
index 2d02b5624c..eee8091a15 100644
--- a/tests/foreign_object/models.py
+++ b/tests/foreign_object/models.py
@@ -150,3 +150,11 @@ class ArticleTranslation(models.Model):
     class Meta:
         unique_together = ('article', 'lang')
         ordering = ('active_translation__title',)
+
+class ArticleTag(models.Model):
+    article = models.ForeignKey(Article, related_name="tags", related_query_name="tag")
+    name = models.CharField(max_length=255)
+
+class ArticleIdea(models.Model):
+    articles = models.ManyToManyField(Article, related_name="ideas", related_query_name="idea_things")
+    name = models.CharField(max_length=255)