Merge branch 'master' into develop

CHANGES.md

UPGRADE.rst

debian/changelog

docs/sample_config.yaml

docs/synctl_workers.md

docs/workers.md

synapse/__init__.py

synapse/app/generic_worker.py

synapse/config/federation.py

synapse/config/homeserver.py

synapse/config/logger.py

synapse/config/redis.py

synapse/config/workers.py

synapse/federation/send_queue.py

synapse/federation/sender/__init__.py

synapse/federation/sender/per_destination_queue.py

synapse/storage/data_stores/main/stream.py