Bump version
Merge branch 'master' of github.com:matrix-org/synapse into develop