Merge branch 'develop' into dbkr/email_notifs_on_pusher

synapse/api/auth.py

synapse/config/key.py

synapse/config/registration.py

synapse/handlers/auth.py

synapse/handlers/register.py

synapse/replication/resource.py

synapse/replication/slave/storage/account_data.py

synapse/replication/slave/storage/events.py

synapse/rest/client/v1/register.py

synapse/storage/_base.py

synapse/storage/event_push_actions.py

synapse/storage/pusher.py

synapse/storage/receipts.py

synapse/storage/schema/delta/32/remove_indices.sql

tests/api/test_auth.py

tests/handlers/test_register.py

tests/replication/slave/storage/test_account_data.py

tests/rest/client/v1/test_register.py

tests/utils.py