Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse
Fix bug where we did not send the full auth chain to people that joined over federation
Add FIXME
Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0
Fix where we pulled in event.state_events from hotfixes branch
Use _get_events_txn instead of _parse_events_txn