Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup

synapse/app/homeserver.py

@@ -651,7 +651,7 @@ def _resource_id(resource, path_seg):
 
 
 def run(hs):
-    PROFILE_SYNAPSE = True
+    PROFILE_SYNAPSE = False
     if PROFILE_SYNAPSE:
         def profile(func):
             from cProfile import Profile