Merge branch 'develop' into babolivier/message_retention

synapse/handlers/pagination.py

synapse/handlers/profile.py

synapse/handlers/register.py

synapse/handlers/room_member.py

synapse/handlers/typing.py

synapse/http/matrixfederationclient.py

synapse/http/servlet.py

synapse/logging/_structured.py

synapse/logging/_terse_json.py

synapse/push/httppusher.py

synapse/push/mailer.py

synapse/python_dependencies.py

synapse/replication/http/__init__.py

synapse/replication/http/devices.py

synapse/replication/http/register.py

synapse/replication/slave/storage/_base.py

synapse/replication/tcp/client.py

synapse/replication/tcp/protocol.py

synapse/replication/tcp/streams/_base.py

synapse/rest/admin/__init__.py