Merge branch 'develop' into application-services

VERSION

setup.py

synapse/api/auth.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/config/logger.py

synapse/crypto/keyclient.py

synapse/federation/federation_server.py

synapse/federation/transaction_queue.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/register.py

synapse/handlers/sync.py

synapse/push/__init__.py

synapse/push/baserules.py

synapse/push/rulekinds.py

synapse/python_dependencies.py

synapse/rest/client/v1/directory.py

synapse/rest/client/v1/push_rule.py