Merge branch 'develop' into py3-xrange-1

synapse/app/federation_sender.py

synapse/app/pusher.py

synapse/app/synchrotron.py

synapse/appservice/scheduler.py

synapse/config/_base.py

synapse/config/appservice.py

synapse/config/logger.py

synapse/config/tls.py

synapse/crypto/keyring.py

synapse/federation/federation_client.py

synapse/groups/attestations.py

synapse/handlers/appservice.py

synapse/handlers/e2e_keys.py

synapse/handlers/federation.py

synapse/handlers/initial_sync.py

synapse/handlers/message.py

synapse/handlers/typing.py

synapse/http/client.py

synapse/http/endpoint.py

synapse/http/matrixfederationclient.py