Merge branch 'develop' into redactyoself

CHANGES.rst

synapse/__init__.py

synapse/app/homeserver.py

synapse/config/__main__.py

synapse/config/_base.py

synapse/config/server.py

synapse/handlers/_base.py

synapse/handlers/events.py

synapse/handlers/typing.py

synapse/notifier.py

synapse/push/__init__.py

synapse/python_dependencies.py

synapse/rest/media/v1/base_resource.py

synapse/rest/media/v1/upload_resource.py

synapse/storage/event_federation.py

synapse/storage/state.py

synapse/util/stringutils.py