diff --git a/HISTORY.rst b/HISTORY.rst
index a628f248..47fc482c 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -41,6 +41,16 @@ PlatformIO 3.0
 
 -------
 
+* Development platform `Atmel AVR <https://github.com/platformio/platform-atmelavr>`__
+
+  + ATTiny Support (1634, x313, x4, x41, x5, x61, x7, x8)
+    (`issue #47 <https://github.com/platformio/platform-atmelavr/issues/47>`_)
+  + New boards: Dwenguino, nicai-systems BOB3 coding bot, NIBO 2 robot,
+    NIBObee robot
+  + AVRDude TCP upload port (``net:host:port``)
+    (`pull #45 <https://github.com/platformio/platform-atmelavr/pull/45>`_)
+  + Fixed uploading for LowPowerLab Moteino
+
 * Development platform `Atmel SAM <https://github.com/platformio/platform-atmelsam>`__
 
   + Support for `PIO Unified Debugger <http://docs.platformio.org/page/plus/debugging.html>`__
@@ -50,7 +60,8 @@ PlatformIO 3.0
 
 * Development platform `Espressif 32 <https://github.com/platformio/platform-espressif32>`__
 
-  + Add support for FireBeetle-ESP32 and IntoRobot Fig
+  + 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
 
@@ -70,6 +81,12 @@ PlatformIO 3.0
 
   + Support for `PIO Unified Debugger <http://docs.platformio.org/page/plus/debugging.html>`__
 
+* Development platform `ST STM32 <https://github.com/platformio/platform-ststm32>`__
+
+  + Support for `PIO Unified Debugger <http://docs.platformio.org/page/plus/debugging.html>`__
+  + Added support for new boards: ST STM32F0308DISCOVERY
+  + Updated ``tool-stlink`` to v1.3.1
+
 * Development platform `Teensy <https://github.com/platformio/platform-teensy>`__
 
   + Updated Teensy Loader CLI to v21
diff --git a/docs b/docs
index 9c6c114d..1a6c873f 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 9c6c114dd5f1ebee72b8bacda036115a72955683
+Subproject commit 1a6c873fe5b670b3acb9bc08cbf7b4cd4395c015
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 3813780b..a134ebf9 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 4, "0a8")
+VERSION = (3, 4, "0a9")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/commands/account.py b/platformio/commands/account.py
index dd559bd3..b2bf9bb0 100644
--- a/platformio/commands/account.py
+++ b/platformio/commands/account.py
@@ -52,7 +52,9 @@ def account_password(**kwargs):
 
 
 @cli.command("token", short_help="Get or regenerate Authentication Token")
+@click.option("-p", "--password")
 @click.option("--regenerate", is_flag=True)
+@click.option("--json-output", is_flag=True)
 def account_token(**kwargs):
     pioplus_call(sys.argv[1:])
 
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index 360bc960..66d8eb75 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -95,7 +95,9 @@ class Upgrader(object):
 
         self._upgraders = [
             (semantic_version.Version("3.0.0-a.1"), self._upgrade_to_3_0_0),
-            (semantic_version.Version("3.0.0-b.11"), self._upgrade_to_3_0_0b11)
+            (semantic_version.Version("3.0.0-b.11"),
+             self._upgrade_to_3_0_0b11),
+            (semantic_version.Version("3.4.0-a.9"), self._update_dev_platforms)
         ]
 
     def run(self, ctx):
@@ -103,10 +105,10 @@ class Upgrader(object):
             return True
 
         result = [True]
-        for item in self._upgraders:
-            if self.from_version >= item[0] or self.to_version < item[0]:
+        for version, callback in self._upgraders:
+            if self.from_version >= version or self.to_version < version:
                 continue
-            result.append(item[1](ctx))
+            result.append(callback(ctx))
 
         return all(result)
 
@@ -147,6 +149,11 @@ class Upgrader(object):
         ctx.invoke(cmd_platform_uninstall, platforms=["espressif"])
         return True
 
+    @staticmethod
+    def _update_dev_platforms(ctx):
+        ctx.invoke(cmd_platform_update)
+        return True
+
 
 def after_upgrade(ctx):
     last_version = app.get_state_item("last_version", "0.0.0")
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index df0b3e81..3dc7f8ff 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.3,<2",
+    "tool-pioplus": ">=0.8.5,<2",
     "tool-unity": "~1.20302.1",
     "tool-scons": "~3.20501.2"
 }