Merge branch 'ldap-changes' into staging

Conflicts:
	django-verdant/rca/static/rca/js/filters.js

wagtail/wagtailredirects/models.py

@@ -6,7 +6,7 @@ class Redirect(models.Model):
     old_path = models.CharField("Redirect from",max_length=255, unique=True, db_index=True)
     site = models.ForeignKey('wagtailcore.Site', null=True, blank=True, related_name='redirects', db_index=True, editable=False)
     is_permanent = models.BooleanField("Permanent", default=True, help_text="Recommended. Permanent redirects ensure search engines forget the old page (the 'Redirect from') and index the new page instead.")
-    redirect_page = models.ForeignKey('wagtailcore.Page', verbose_name="Redirect to a page", related_name='+', null=True, blank=True)
+    redirect_page = models.ForeignKey('wagtailcore.Page', verbose_name="Redirect to a page", null=True, blank=True)
     redirect_link = models.URLField("Redirect to any URL", blank=True)
 
     @property

wagtail/wagtailredirects/views.py

@@ -13,7 +13,7 @@ REDIRECT_EDIT_HANDLER = ObjectList(models.Redirect.content_panels)
 @permission_required('wagtailredirects.change_redirect')
 def index(request):
     # Get redirects
-    redirects = models.Redirect.get_for_site(site=request.site)
+    redirects = models.Redirect.get_for_site(site=request.site).prefetch_related('redirect_page')
 
     # Render template
     return render(request, "wagtailredirects/index.html", {