Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse
Mention that we should pull in new deps before running upgrade script
Don't assume an event exists
Use is_outlier() so that we don't get AttributeError
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0

Conflicts:
	synapse/state.py
Make error messages slightly more helpful
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
Don't yield on sending the event accross federation.
Replace distributor deferred list, with a simple for loop until I understand why the former breaks and the latter doesn't
Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them
Merge branch 'develop' into release-v0.6.0
s/user_id/sender/