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

VERSION

-0.6.1a
+0.6.1b

synapse/__init__.py

@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.6.1a"
+__version__ = "0.6.1b"

synapse/events/utils.py

@@ -106,7 +106,7 @@ def serialize_event(hs, e, client_event=True):
 
     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)