Merge branch 'develop' into markjh/config_cleanup

Conflicts:
	synapse/config/captcha.py

1 files changed, 1 insertions, 0 deletions

diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py

index ba7037aeb1..ee5c238314 100644
--- a/synapse/config/captcha.py
+++ b/synapse/config/captcha.py
@@ -21,6 +21,7 @@ class CaptchaConfig(Config):
         self.recaptcha_private_key = config["recaptcha_private_key"]
         self.recaptcha_public_key = config["recaptcha_public_key"]
         self.enable_registration_captcha = config["enable_registration_captcha"]
+        # XXX: This is used for more than just captcha
         self.captcha_ip_origin_is_x_forwarded = (
             config["captcha_ip_origin_is_x_forwarded"]
         )