Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse v0.6.1b

2 files changed, 2 insertions, 2 deletions

diff --git a/synapse/__init__.py b/synapse/__init__.py

index 2195ad3177..e7e27b06ec 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.6.1a"
+__version__ = "0.6.1b"
diff --git a/synapse/events/utils.py b/synapse/events/utils.py

index 4f4914467c..4ad37188ba 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -98,7 +98,7 @@ def serialize_event(hs, e):
     d = {k: v for k, v in e.get_dict().items()}
     if "age_ts" in d["unsigned"]:
         now = int(hs.get_clock().time_msec())
-        d["unsigned"]["age"] = now - d["unsigned"]["age_ts"]
+        d["age"] = now - d["unsigned"]["age_ts"]
         del d["unsigned"]["age_ts"]
 
     d["user_id"] = d.pop("sender", None)