Remove lie from change log.
Merge branch 'develop' of github.com:matrix-org/synapse
Fix undefined variable error
Merge branch 'master' of github.com:matrix-org/synapse into develop