Merge remote-tracking branch 'origin/develop' into rav/drop_py35

synapse/module_api/__init__.py

synapse/replication/tcp/protocol.py

synapse/rest/media/v1/preview_url_resource.py

synapse/server.py

synapse/state/__init__.py

synapse/storage/databases/main/media_repository.py

.../schema/delta/59/11drop_thumbnail_constraint.sql.postgres

synapse/util/caches/expiringcache.py

tests/config/test_load.py

tests/crypto/test_keyring.py

tests/events/test_presence_router.py

tests/handlers/test_sync.py

tests/logging/test_terse_json.py

tests/module_api/test_api.py

tests/storage/test_devices.py

tests/storage/test_directory.py

tests/storage/test_end_to_end_keys.py

tests/storage/test_event_push_actions.py

tests/storage/test_profile.py

tests/storage/test_redaction.py