Merge branch 'develop' into travis/login-terms

.circleci/config.yml

CHANGES.md

changelog.d/3578.bugfix

changelog.d/3699.misc

changelog.d/3794.misc

changelog.d/3836.bugfix

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

changelog.d/3903.misc

changelog.d/3904.misc

changelog.d/3906.misc

changelog.d/3907.bugfix