Merge branch 'develop' into daniel/roomcleanupincremental

Conflicts:
	synapse/rest/client/v1/room.py

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 1f5ee09dcc..cf7fcb04ff 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -165,7 +165,7 @@ class RoomStateEventRestServlet(ClientV1RestServlet):
         else:
             yield msg_handler.send_nonmember_event(event, context)
 
-        defer.returnValue((200, {}))
+        defer.returnValue((200, {"event_id": event.event_id}))
 
 
 # TODO: Needs unit testing for generic events + feedback