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

README.rst

UPGRADE.rst

docs/metrics-howto.rst

synapse/api/auth.py

synapse/api/errors.py

synapse/config/registration.py

synapse/crypto/keyring.py

synapse/handlers/presence.py

synapse/handlers/room.py

synapse/http/server.py

synapse/http/servlet.py

synapse/push/baserules.py

synapse/push/rulekinds.py

synapse/python_dependencies.py

synapse/rest/client/v2_alpha/sync.py

synapse/rest/media/v1/base_resource.py

synapse/rest/media/v1/download_resource.py

synapse/rest/media/v1/identicon_resource.py

synapse/rest/media/v1/thumbnail_resource.py

synapse/rest/media/v1/upload_resource.py