Conflicts: CHANGELOG.txt docs/releases/index.rst wagtail/project_template/requirements.txt wagtail/wagtailcore/__init__.py