Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_cache_size

synapse/handlers/_base.py

synapse/handlers/register.py

synapse/handlers/room.py

synapse/push/baserules.py

synapse/rest/client/v1/login.py

synapse/rest/client/v1/push_rule.py

synapse/rest/client/v1/room.py

synapse/storage/presence.py

synapse/storage/push_rule.py

synapse/storage/registration.py

.../storage/schema/delta/30/threepid_guest_access_tokens.sql