Merge branch 'develop' into storage_transactions

.gitignore

cmdclient/console.py

docs/client-server/swagger_matrix/api-docs

docs/client-server/swagger_matrix/directory

docs/client-server/swagger_matrix/events

docs/client-server/swagger_matrix/presence

docs/client-server/swagger_matrix/rooms

docs/client-server/urls.rst

synapse/app/homeserver.py

synapse/handlers/__init__.py

synapse/handlers/typing.py

synapse/rest/__init__.py

synapse/rest/directory.py

synapse/rest/presence.py

synapse/rest/public.py

synapse/rest/room.py

synapse/server.py

tests/handlers/test_typing.py

tests/rest/test_events.py

tests/rest/test_presence.py