Merge branch 'wagtail-separation' into develop

wagtail/wagtailadmin/edit_handlers.py

@@ -13,7 +13,7 @@ import copy
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.util import camelcase_to_underscore
 from wagtail.wagtailcore.fields import RichTextArea
-from cluster.forms import ClusterForm, ClusterFormMetaclass
+from modelcluster.forms import ClusterForm, ClusterFormMetaclass
 from taggit.forms import TagWidget
 
 import re

wagtail/wagtailcore/models.py

@@ -7,7 +7,7 @@ from django.core.cache import cache
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import Group
 from treebeard.mp_tree import MP_Node
-from cluster.models import ClusterableModel
+from modelcluster.models import ClusterableModel
 from wagtail.wagtailsearch import Indexed, Searcher
 
 from wagtail.wagtailcore.util import camelcase_to_underscore