Merge branch 'develop' of github.com:matrix-org/synapse into rejections

Conflicts:
	synapse/storage/schema/im.sql

1 files changed, 2 insertions, 1 deletions

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

index bb439ed9d0..038e5eba11 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -312,7 +312,8 @@ class StateHandler(object):
             except AuthError:
                 pass
 
-        # Oh dear.
+        # Use the last event (the one with the least depth) if they all fail
+        # the auth check.
         return event
 
     def _ordered_events(self, events):