Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

synapse/rest/room.py

@@ -351,6 +351,13 @@ class RoomMemberListRestServlet(RestServlet):
             room_id=urllib.unquote(room_id),
             user_id=user.to_string())
 
+        for event in members["chunk"]:
+            target_user = self.hs.parse_userid(event["target_user_id"])
+            presence_state = yield self.handlers.presence_handler.get_state(
+                target_user=target_user, auth_user=user
+            )
+            event["content"].update(presence_state)
+
         defer.returnValue((200, members))