Merge branch 'develop' of github.com:matrix-org/synapse
Fixed registration flow when registering with matrixID & password and no email
BF: presence PUT requests stopped to work with old "state" param yesterday evening :( -https://github.com/matrix-org/synapse/commit/cda31fb7553ba3d880de09a464ae3b62ea6632fc?diff=unified
Merge branch 'master' into develop