Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse
Bump pinned version of pynacl pulled from github
Bump version
Merge branch 'master' of github.com:matrix-org/synapse into develop