diff --git a/HISTORY.rst b/HISTORY.rst
index 3fd03d2e..54ce9c93 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -9,10 +9,11 @@ PlatformIO 4.0
 4.0.1 (2019-??-??)
 ~~~~~~~~~~~~~~~~~~
 
-* Print `debug tool <http://docs.platformio.org/en/latest/plus/debugging.html#tools-debug-probes>`__ name for the active debugging session
+* Print `debug tool <http://docs.platformio.org/page/plus/debugging.html#tools-debug-probes>`__ name for the active debugging session
 * Do not shutdown PIO Home Server for "upgrade" operations (`issue #2784 <https://github.com/platformio/platformio-core/issues/2784>`_)
 * Improved computing of project check sum (structure, configuration) and avoid unnecessary rebuilding
-* Fixed an issue with incorrect escaping of Windows slashes when using `PIO Unified Debugger <http://docs.platformio.org/en/latest/plus/debugging.html>`__ and "piped" openOCD
+* Renamed "enable_ssl" setting to `strict_ssl <http://docs.platformio.org/page/userguide/cmd_settings.html#strict-ssl>`__
+* Fixed an issue with incorrect escaping of Windows slashes when using `PIO Unified Debugger <http://docs.platformio.org/page/plus/debugging.html>`__ and "piped" openOCD
 
 4.0.0 (2019-07-10)
 ~~~~~~~~~~~~~~~~~~
diff --git a/README.rst b/README.rst
index e45891e2..1b539c67 100644
--- a/README.rst
+++ b/README.rst
@@ -129,12 +129,13 @@ Contributing
 See `contributing guidelines <https://github.com/platformio/platformio/blob/develop/CONTRIBUTING.md>`_.
 
 Telemetry / Privacy Policy
----------------------------
+--------------------------
 
-Share diagnostics and usage information to help us make PlatformIO better. It is enabled by default. For more information see:
+Share minimal diagnostics and usage information to help us make PlatformIO better.
+It is enabled by default. For more information see:
 
 * `Telemetry Setting <https://docs.platformio.org/en/latest/userguide/cmd_settings.html?utm_source=github&utm_medium=core#enable-telemetry>`_
-* `SSL Setting <https://docs.platformio.org/en/latest/userguide/cmd_settings.html?utm_source=github&utm_medium=core#enable-ssl>`_
+* `SSL Setting <https://docs.platformio.org/en/latest/userguide/cmd_settings.html?utm_source=github&utm_medium=core#strict-ssl>`_
 
 License
 -------
diff --git a/docs b/docs
index 3f6ebfa0..994c8210 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 3f6ebfa0a925a48e9dab081fd4f40a274258d44a
+Subproject commit 994c821046b7dc118d58530eeb6badf57f19f45d
diff --git a/platformio/app.py b/platformio/app.py
index 74d4c9cb..75eea6db 100644
--- a/platformio/app.py
+++ b/platformio/app.py
@@ -73,8 +73,8 @@ DEFAULT_SETTINGS = {
         "description": "Enable caching for API requests and Library Manager",
         "value": True
     },
-    "enable_ssl": {
-        "description": "Enable SSL for PlatformIO Services",
+    "strict_ssl": {
+        "description": "Strict SSL for PlatformIO Services",
         "value": False
     },
     "enable_telemetry": {
diff --git a/platformio/managers/lib.py b/platformio/managers/lib.py
index b6f630c8..b7fc8e51 100644
--- a/platformio/managers/lib.py
+++ b/platformio/managers/lib.py
@@ -211,7 +211,7 @@ class LibraryManager(BasePkgManager):
 
         return self._install_from_url(
             name, dl_data['url'].replace("http://", "https://")
-            if app.get_setting("enable_ssl") else dl_data['url'], requirements)
+            if app.get_setting("strict_ssl") else dl_data['url'], requirements)
 
     def search_lib_id(  # pylint: disable=too-many-branches
             self,
diff --git a/platformio/managers/platform.py b/platformio/managers/platform.py
index 1a45e433..b8fbdf7c 100644
--- a/platformio/managers/platform.py
+++ b/platformio/managers/platform.py
@@ -47,7 +47,7 @@ class PlatformManager(BasePkgManager):
             repositories = [
                 "https://dl.bintray.com/platformio/dl-platforms/manifest.json",
                 "{0}://dl.platformio.org/platforms/manifest.json".format(
-                    "https" if app.get_setting("enable_ssl") else "http")
+                    "https" if app.get_setting("strict_ssl") else "http")
             ]
         BasePkgManager.__init__(self, package_dir
                                 or get_project_platforms_dir(), repositories)
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index d35aac40..a1b1ddab 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -302,6 +302,9 @@ def measure_ci():
         },
         "DRONE": {
             "label": getenv("DRONE_REPO_SLUG")
+        },
+        "GITLAB": {
+            "label": getenv("CI_PROJECT_PATH_SLUG")
         }
     }
 
diff --git a/platformio/util.py b/platformio/util.py
index 377160b1..f2c97c2b 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -333,7 +333,7 @@ def _get_api_result(
     headers = get_request_defheaders()
     if not url.startswith("http"):
         url = __apiurl__ + url
-        if not get_setting("enable_ssl"):
+        if not get_setting("strict_ssl"):
             url = url.replace("https://", "http://")
 
     try: