diff --git a/.gitignore b/.gitignore
index 16d27c1b..dfcb0c78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .tox
 docs/_build
 dist
+build
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 3e4ac33c..5645ddd1 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -214,14 +214,14 @@ Arduino
 
     * - ``due``
       - `Arduino Due (Programming Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
-      - AT91SAM3X8E
+      - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
 
     * - ``dueUSB``
       - `Arduino Due (USB Native Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
-      - AT91SAM3X8E
+      - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
@@ -380,6 +380,20 @@ Arduino
       - 32 Kb
       - 2.5 Kb
 
+    * - ``zero``
+      - `Arduino Zero (Programming Port) <https://www.arduino.cc/en/Main/ArduinoBoardZero>`_
+      - SAMD21G18A
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
+    * - ``zeroUSB``
+      - `Arduino Zero (USB Native Port) <https://www.arduino.cc/en/Main/ArduinoBoardZero>`_
+      - SAMD21G18A
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
 BQ
 ~~
 
@@ -693,7 +707,7 @@ NodeMCU
       - RAM
 
     * - ``nodemcu``
-      - `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
+      - `NodeMCU 0.9 / 1.0 <http://www.nodemcu.com/>`_
       - ESP8266
       - 80 MHz
       - 4096 Kb
@@ -1073,7 +1087,7 @@ Teensy
       - 16 Kb
 
     * - ``teensy31``
-      - `Teensy 3.1 <https://www.pjrc.com/store/teensy31.html>`_
+      - `Teensy 3.1 / 3.2 <https://www.pjrc.com/store/teensy31.html>`_
       - MK20DX256
       - 72 MHz
       - 256 Kb
diff --git a/docs/frameworks/mbed.rst b/docs/frameworks/mbed.rst
index d67ad290..0419ad82 100644
--- a/docs/frameworks/mbed.rst
+++ b/docs/frameworks/mbed.rst
@@ -716,7 +716,7 @@ Teensy
       - RAM
 
     * - ``teensy31``
-      - `Teensy 3.1 <https://www.pjrc.com/store/teensy31.html>`_
+      - `Teensy 3.1 / 3.2 <https://www.pjrc.com/store/teensy31.html>`_
       - MK20DX256
       - 72 MHz
       - 256 Kb
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index 8b7b62ce..053f2b67 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -34,6 +34,9 @@ Packages
     * - ``ldscripts``
       - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
 
+    * - ``tool-openocd``
+      - `OpenOCD <http://openocd.org>`_
+
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
@@ -84,18 +87,32 @@ Arduino
 
     * - ``due``
       - `Arduino Due (Programming Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
-      - AT91SAM3X8E
+      - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
 
     * - ``dueUSB``
       - `Arduino Due (USB Native Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
-      - AT91SAM3X8E
+      - SAM3X8E
       - 84 MHz
       - 512 Kb
       - 32 Kb
 
+    * - ``zero``
+      - `Arduino Zero (Programming Port) <https://www.arduino.cc/en/Main/ArduinoBoardZero>`_
+      - SAMD21G18A
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
+    * - ``zeroUSB``
+      - `Arduino Zero (USB Native Port) <https://www.arduino.cc/en/Main/ArduinoBoardZero>`_
+      - SAMD21G18A
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
 Atmel
 ~~~~~
 
diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index c20cdf37..90fea1c7 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -119,6 +119,9 @@ Packages
     * - ``tool-mspdebug``
       - `MSPDebug <http://mspdebug.sourceforge.net/>`_
 
+    * - ``tool-openocd``
+      - `OpenOCD <http://openocd.org>`_
+
     * - ``tool-rfdloader``
       - `rfdloader <https://github.com/RFduino/RFduino>`_
 
diff --git a/docs/platforms/espressif.rst b/docs/platforms/espressif.rst
index 32de397f..200263f0 100644
--- a/docs/platforms/espressif.rst
+++ b/docs/platforms/espressif.rst
@@ -163,7 +163,7 @@ NodeMCU
       - RAM
 
     * - ``nodemcu``
-      - `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
+      - `NodeMCU 0.9 / 1.0 <http://www.nodemcu.com/>`_
       - ESP8266
       - 80 MHz
       - 4096 Kb
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index 2cf02492..45e1d1c5 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -113,7 +113,7 @@ Teensy
       - 16 Kb
 
     * - ``teensy31``
-      - `Teensy 3.1 <https://www.pjrc.com/store/teensy31.html>`_
+      - `Teensy 3.1 / 3.2 <https://www.pjrc.com/store/teensy31.html>`_
       - MK20DX256
       - 72 MHz
       - 256 Kb
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 35d08ccc..22b4ead7 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 7, 1)
+VERSION = (2, 7, "2.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/platforms/base.py b/platformio/platforms/base.py
index 5a4718b7..734d4660 100644
--- a/platformio/platforms/base.py
+++ b/platformio/platforms/base.py
@@ -129,6 +129,9 @@ PLATFORM_PACKAGES = {
     "tool-bossac": [
         ("BOSSA CLI", "https://sourceforge.net/projects/b-o-s-s-a/")
     ],
+    "tool-openocd": [
+        ("OpenOCD", "http://openocd.org")
+    ],
     "tool-stlink": [
         ("ST-Link", "https://github.com/texane/stlink")
     ],