Merge branch 'develop' into invite_power_level

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/push/baserules.py

synapse/push/rulekinds.py

synapse/python_dependencies.py

synapse/rest/media/v1/base_resource.py

synapse/rest/media/v1/identicon_resource.py

synapse/storage/schema/delta/14/upgrade_appservice_db.py

synapse/storage/schema/delta/14/v14.sql

synapse/util/async.py

tests/handlers/test_presence.py