Merge branch 'develop' into rei/room_stats_separated

1 files changed, 1 insertions, 1 deletions

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

index c30b6de19c..0910930c21 100644
--- a/synapse/util/metrics.py
+++ b/synapse/util/metrics.py
@@ -67,7 +67,7 @@ def measure_func(name):
         def measured_func(self, *args, **kwargs):
             with Measure(self.clock, name):
                 r = yield func(self, *args, **kwargs)
-            defer.returnValue(r)
+            return r
 
         return measured_func