Merge branch 'master' of github.com:matrix-org/synapse into develop

CHANGES.md

INSTALL.md

changelog.d/5418.bugfix

debian/changelog

docs/MSC1711_certificates_FAQ.md

docs/federate.md

synapse/__init__.py

synapse/app/homeserver.py

synapse/push/mailer.py

synapse/python_dependencies.py

synapse/res/templates/password_reset_success.html

synapse/rest/client/v2_alpha/account.py

tests/push/test_email.py

tests/push/test_http.py

tests/rest/client/test_consent.py

tests/rest/client/v2_alpha/test_account.py

tests/rest/client/v2_alpha/test_register.py

tests/unittest.py