Merge with develop and fix merge conflicts

evennia/utils/idmapper/manager.py

@@ -5,10 +5,6 @@ from django.db.models.manager import Manager
 
 
 class SharedMemoryManager(Manager):
-    # CL: this ensures our manager is used when accessing instances via
-    # ForeignKey etc. (see docs)
-    use_for_related_fields = True
-
     # TODO: improve on this implementation
     # We need a way to handle reverse lookups so that this model can
     # still use the singleton cache, but the active model isn't required

evennia/utils/idmapper/tests.py

@@ -17,14 +17,14 @@ class RegularCategory(models.Model):
 
 class Article(SharedMemoryModel):
     name = models.CharField(max_length=32)
-    category = models.ForeignKey(Category)
-    category2 = models.ForeignKey(RegularCategory)
+    category = models.ForeignKey(Category, on_delete=models.CASCADE)
+    category2 = models.ForeignKey(RegularCategory, on_delete=models.CASCADE)
 
 
 class RegularArticle(models.Model):
     name = models.CharField(max_length=32)
-    category = models.ForeignKey(Category)
-    category2 = models.ForeignKey(RegularCategory)
+    category = models.ForeignKey(Category, on_delete=models.CASCADE)
+    category2 = models.ForeignKey(RegularCategory, on_delete=models.CASCADE)
 
 
 class SharedMemorysTest(TestCase):