Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse
Merge branch 'develop' of github.com:matrix-org/synapse
Bump version and changelog