Merge branch 'develop' into request_logging

Conflicts:
	synapse/config/logger.py

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/streams/events.py b/synapse/streams/events.py

index 41715436b0..fb698d2d71 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -35,7 +35,7 @@ class NullSource(object):
         return defer.succeed(0)
 
     def get_pagination_rows(self, user, pagination_config, key):
-        return defer.succeed(([], pagination_config.from_token))
+        return defer.succeed(([], pagination_config.from_key))
 
 
 class EventSources(object):