Merge branch 'develop' into markjh/direct_to_device

CHANGES.rst

synapse/__init__.py

synapse/appservice/__init__.py

synapse/appservice/api.py

synapse/appservice/scheduler.py

synapse/crypto/keyring.py

synapse/federation/federation_base.py

synapse/federation/federation_client.py

synapse/handlers/appservice.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/typing.py

synapse/notifier.py

synapse/push/push_tools.py

synapse/push/pusherpool.py

synapse/rest/client/v2_alpha/register.py

synapse/rest/client/v2_alpha/thirdparty.py

synapse/storage/events.py

synapse/storage/stream.py

synapse/util/async.py