Merge branch 'support/2.7' into develop

core/config.class.inc.php

@@ -1365,7 +1365,16 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-	];
+		'trust_proxies' => [
+			'type' => 'bool',
+			'description' => 'If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
+	);
+
 
 
 	public function IsProperty($sPropCode)