Merge branch 'develop' into rav/deferred_timeout

CHANGES.rst

synapse/__init__.py

synapse/federation/federation_server.py

synapse/handlers/federation.py

synapse/storage/room.py

synapse/storage/search.py

tests/config/test_load.py

tests/crypto/test_keyring.py

tests/test_distributor.py

tests/util/test_file_consumer.py

tests/util/test_linearizer.py