Merge branch 'develop' into dbkr/notifications_api

README.rst

docs/workers.rst

synapse/appservice/__init__.py

synapse/appservice/api.py

synapse/config/appservice.py

synapse/handlers/appservice.py

synapse/push/action_generator.py

synapse/push/bulk_push_rule_evaluator.py

synapse/rest/__init__.py

synapse/rest/client/v2_alpha/thirdparty.py

synapse/storage/_base.py

synapse/storage/appservice.py

synapse/storage/event_push_actions.py

synapse/storage/push_rule.py

synapse/storage/pusher.py

synapse/storage/receipts.py

synapse/storage/signatures.py

synapse/storage/state.py

synapse/types.py

synapse/util/caches/descriptors.py