Merge branch 'develop' into typing_notifications

docs/media_repository.rst

setup.py

synapse/api/errors.py

synapse/api/urls.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/config/repository.py

synapse/http/matrixfederationclient.py

synapse/http/server.py

synapse/media/__init__.py

synapse/media/v0/__init__.py

synapse/media/v0/content_repository.py

synapse/media/v1/__init__.py

synapse/media/v1/base_resource.py

synapse/media/v1/download_resource.py

synapse/media/v1/filepath.py

synapse/media/v1/media_repository.py

synapse/media/v1/thumbnail_resource.py

synapse/media/v1/thumbnailer.py

synapse/media/v1/upload_resource.py