Merge branch 'master' into 1429177_Proxy

diff --combined README.md
index 5296410c2bf1f5a90dae37ded7db76b4b6557900,ca54c367677605abef7b7d92f6e172906d338b69..d744abf695041d64d8cd8aedbf1ba26e3cd28004
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -314,17 -314,17 +314,17 @@@ same folder name are grouped together
  ```
  ### Proxy
  This policy allows you to specify proxy settings. These settings correspond to the connection settings in Firefox preferences.
- To specify ports, append them to the URLs with a colon (:). If Locked is set to true, the values can't be changed by the user.
+ To specify ports, append them to the hostnames with a colon (:). If Locked is set to true, the values can't be changed by the user.
  ```
  {
    "Proxy": {
      "Mode": ["none", "system", "manual", "autoDetect", "autoConfig"]
      "Locked": [true, false]
- Z   "HTTPProxy": "URL_TO_PROXY",
+     "HTTPProxy": "hostname",
      "UseHTTPProxyForAllProtocols": [true, false]
-     "SSLProxy": "URL_TO_PROXY",
-     "FTPProxy": "URL_TO_PROXY",
-     "SOCKSProxy": { "URL_TO_PROXY",
+     "SSLProxy": "hostname",
+     "FTPProxy": "hostname",
 -    "SOCKSProxy": { "hostname",
++    "SOCKSProxy": "hostname",
      "SOCKSVersion": [4, 5],
      "Passthrough": "List of passthrough addresses/domains",
      "AutoConfigURL": "URL_TO_AUTOCONFIG",