Merge branch 'develop' into matthew/autocreate_autojoin

.circleci/config.yml

.circleci/merge_base_branch.sh

CHANGES.md

MANIFEST.in

MAP.rst

README.rst

UPGRADE.rst

changelog.d/3578.bugfix

changelog.d/3699.misc

changelog.d/3794.misc

changelog.d/3868.bugfix

changelog.d/3873.misc

changelog.d/3879.bugfix

changelog.d/3883.feature

changelog.d/3889.bugfix

changelog.d/3892.bugfix

changelog.d/3894.feature

changelog.d/3895.bugfix

changelog.d/3897.misc

changelog.d/3899.bugfix