Merge pull request #1009 from matrix-org/erikj/event_split

synapse/app/pusher.py

synapse/app/synchrotron.py

synapse/handlers/__init__.py

synapse/handlers/presence.py

synapse/replication/resource.py

synapse/replication/slave/storage/_base.py

synapse/replication/slave/storage/directory.py

synapse/rest/client/v1/admin.py

synapse/rest/client/v1/base.py

synapse/rest/client/v1/directory.py

synapse/rest/client/v1/events.py

synapse/rest/client/v1/initial_sync.py

synapse/rest/client/v1/login.py

synapse/rest/client/v1/profile.py

synapse/rest/client/v1/register.py

synapse/rest/client/v1/room.py

synapse/server.py

synapse/storage/__init__.py

synapse/storage/_base.py

synapse/storage/directory.py