Merge branch 'develop' into markjh/v2_sync_typing

synapse/api/auth.py

synapse/events/utils.py

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/__init__.py

synapse/handlers/federation.py

synapse/handlers/room.py

synapse/handlers/search.py

synapse/handlers/sync.py

synapse/rest/client/v1/login.py

synapse/rest/client/v1/room.py

synapse/rest/client/v2_alpha/sync.py

synapse/storage/__init__.py

synapse/storage/_base.py

synapse/storage/events.py

synapse/storage/room.py

synapse/storage/roommember.py

synapse/storage/schema/delta/24/fts.py