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

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/util/file_consumer.py b/synapse/util/file_consumer.py

index 629ed44149..8b17d1c8b8 100644
--- a/synapse/util/file_consumer.py
+++ b/synapse/util/file_consumer.py
@@ -17,7 +17,7 @@ from six.moves import queue
 
 from twisted.internet import threads
 
-from synapse.util.logcontext import make_deferred_yieldable, run_in_background
+from synapse.logging.context import make_deferred_yieldable, run_in_background
 
 
 class BackgroundFileConsumer(object):