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

.gitignore

CHANGES.rst

README.rst

scripts-dev/check_auth.py

scripts/synapse_port_db

setup.py

synapse/__init__.py

synapse/api/auth.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/crypto/keyring.py

synapse/handlers/_base.py

synapse/metrics/__init__.py

synapse/rest/client/v2_alpha/account.py

synapse/storage/schema/delta/23/drop_state_index.sql