Merge branch 'develop' into matthew/fix_overzealous_ll_state

changelog.d/3760.bugfix

@@ -0,0 +1 @@
+Don't return non-LL-member state in incremental sync state blocks

synapse/handlers/sync.py

@@ -794,6 +794,7 @@ class SyncHandler(object):
                         # We're returning an incremental sync, with no
                         # "gap" since the previous sync, so normally there would be
                         # no state to return.
+
                         # But we're lazy-loading, so the client might need some more
                         # member events to understand the events in this timeline.
                         # So we fish out all the member events corresponding to the