Merge branch 'develop' into sh-cas-auth-via-homeserver

MANIFEST.in

synapse/api/auth.py

synapse/api/filtering.py

synapse/app/homeserver.py

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/_base.py

synapse/handlers/events.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/private_user_data.py

synapse/handlers/receipts.py

synapse/handlers/room.py

synapse/handlers/search.py

synapse/handlers/sync.py

synapse/handlers/typing.py

synapse/http/matrixfederationclient.py