diff --git a/HISTORY.rst b/HISTORY.rst
index 24dbb02e..9501fe34 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -63,10 +63,10 @@ PlatformIO 3.0
 
 * Development platform `Espressif 32 <https://github.com/platformio/platform-espressif32>`__
 
+  + New boards: Adafruit Feather, FireBeetle-ESP32, IntoRobot Fig, NodeMCU-32S, Onehorse ESP32 Dev Module, and Widora AIR
   + Added support for OTA (Over-The-Air) updates
-  + Added support for FireBeetle-ESP32 and IntoRobot Fig
-  + Update ESP-IDF framework to v2.0
-  + Update core for Arduino framework
+  + Updated ESP-IDF framework to v2.0
+  + Updated core for Arduino framework
 
 * Development platform `Freescale Kinetis <https://github.com/platformio/platform-freescalekinetis>`__
 
diff --git a/docs b/docs
index fcd6682c..2632e42e 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit fcd6682c9f6cf34377577663eb649782f9fbb300
+Subproject commit 2632e42e8abd26cd190f18b92ae39fdd0cf484ff
diff --git a/platformio/commands/run.py b/platformio/commands/run.py
index e723b085..76cdc52c 100644
--- a/platformio/commands/run.py
+++ b/platformio/commands/run.py
@@ -122,18 +122,19 @@ def cli(ctx, environment, target, upload_port, project_dir, silent, verbose,
 
 class EnvironmentProcessor(object):
 
-    KNOWN_OPTIONS = ("platform", "framework", "board", "board_mcu",
-                     "board_f_cpu", "board_f_flash", "board_flash_mode",
-                     "build_flags", "src_build_flags", "build_unflags",
-                     "src_filter", "extra_script", "targets", "upload_port",
-                     "upload_protocol", "upload_speed", "upload_flags",
-                     "upload_resetmethod", "lib_deps", "lib_ignore",
-                     "lib_extra_dirs", "lib_ldf_mode", "lib_compat_mode",
-                     "piotest", "test_ignore", "test_port", "debug_tool",
-                     "debug_port", "debug_init_cmds", "debug_extra_cmds")
+    KNOWN_OPTIONS = (
+        "platform", "framework", "board", "board_mcu", "board_f_cpu",
+        "board_f_flash", "board_flash_mode", "build_flags", "src_build_flags",
+        "build_unflags", "src_filter", "extra_script", "targets",
+        "upload_port", "upload_protocol", "upload_speed", "upload_flags",
+        "upload_resetmethod", "lib_deps", "lib_ignore", "lib_extra_dirs",
+        "lib_ldf_mode", "lib_compat_mode", "piotest", "test_ignore",
+        "test_port", "debug_tool", "debug_port", "debug_init_cmds",
+        "debug_extra_cmds", "debug_server", "debug_init_break")
 
     IGNORE_BUILD_OPTIONS = ("debug_tool", "debug_port", "debug_init_cmds",
-                            "debug_extra_cmds")
+                            "debug_extra_cmds", "debug_server",
+                            "debug_init_break")
 
     REMAPED_OPTIONS = {"framework": "pioframework", "platform": "pioplatform"}
 
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index e5a86447..6b8054f6 100644
--- a/platformio/managers/core.py
+++ b/platformio/managers/core.py
@@ -22,7 +22,7 @@ from platformio.managers.package import PackageManager
 
 CORE_PACKAGES = {
     "pysite-pioplus": ">=0.3.0,<2",
-    "tool-pioplus": ">=0.8.10,<2",
+    "tool-pioplus": ">=0.8.11,<2",
     "tool-unity": "~1.20302.1",
     "tool-scons": "~3.20501.2"
 }