Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py

index b54bf5411f..e5b36494f5 100644
--- a/synapse/appservice/scheduler.py
+++ b/synapse/appservice/scheduler.py
@@ -53,8 +53,8 @@ import logging
 from twisted.internet import defer
 
 from synapse.appservice import ApplicationServiceState
+from synapse.logging.context import run_in_background
 from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.util.logcontext import run_in_background
 
 logger = logging.getLogger(__name__)