Merge pull request #285 from matrix-org/daniel/metrics-2

synapse/app/homeserver.py

synapse/app/synctl.py

synapse/config/_base.py

synapse/config/appservice.py

synapse/config/captcha.py

synapse/config/database.py

synapse/config/key.py

synapse/config/logger.py

synapse/config/metrics.py

synapse/config/ratelimiting.py

synapse/config/registration.py

synapse/config/repository.py

synapse/config/saml2.py

synapse/config/server.py

synapse/config/tls.py

synapse/config/voip.py

synapse/storage/__init__.py

synapse/storage/events.py

synapse/storage/registration.py

synapse/storage/schema/delta/24/stats_reporting.sql