Merge branch 'master' into 1433870_EnableTrackingProtection

diff --cc README.md
index 8c9cdcc2123778cf7158e43746e02202a53cc870,42e038291bc027fde2c091d5bea0a930de554ac8..c263320b4dc7f04d9783949a2bcd742c8fd29325
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -197,21 -197,21 +197,36 @@@ This policy stops Firefox from checkin
    }
  }
  ```
 +### EnableTrackingProtection
 +This policy affects tracking protection.
 +
 +If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
 +
 +If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
 +
 +If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
 +```
 +{
 +  "policies": {
 +    "EnableTrackingProtection": {
 +      "Value": [true, false],
 +      "Locked": [true, false]
 +    }
+ ### NoDefaultBookmarks
+ Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.
+ ```
+ {
+   "policies": {
+     "NoDefaultBookmarks": true
+   }
+ }
+ ```
+ ### NoSmartBookmarks
+ Remove the Smart Bookmarks (Most Visited, Recent Tags)
+ ```
+ {
+   "policies": {
+     "NoSmartBookmarks": true
    }
  }
  ```

diff --cc windows/en-US/firefox.adml
Simple merge

diff --cc windows/firefox.admx
Simple merge