Merge branch 'develop' into storage_transactions

Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py

2 files changed, 6 insertions, 2 deletions

diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 85a0f5dff5..f141e92ce2 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -44,7 +44,7 @@ class BaseRoomHandler(BaseHandler):
         )))
         event.destinations = list(destinations)
 
-        self.notifier.on_new_room_event(event, extra_users=[])
+        self.notifier.on_new_room_event(event, extra_users=extra_users)
 
         federation_handler = self.hs.get_handlers().federation_handler
         yield federation_handler.handle_new_event(event, snapshot)
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 1656717cd7..3d3fcdabdb 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -178,9 +178,13 @@ class Notifier(object):
         if timeout:
             reactor.callLater(timeout/1000, self._timeout_listener, listener)
 
-        self._register_with_keys(listener)
+            self._register_with_keys(listener)
+
         yield self._check_for_updates(listener)
 
+        if not timeout:
+            self._timeout_listener(listener)
+
         return
 
     def _timeout_listener(self, listener):