diff --git a/HISTORY.rst b/HISTORY.rst
index 316b852d..67c4dd35 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -22,6 +22,35 @@ PlatformIO 3.0
   + Created `staging <http://docs.platformio.org/en/stable/platforms/espressif8266.html#using-arduino-framework-with-staging-version>`__
     branch to work with development version of Arduino Framework
 
+* Development platform `Freescale Kinetis <https://github.com/platformio/platform-freescalekinetis>`__
+
+  + Added support for new boards: FRDM-KL26Z, FRDM-KL27Z, FRDM-KL43Z, Hexiwear
+
+* Development platform `Nordic nRF51 <https://github.com/platformio/platform-nordicnrf51>`__
+
+  + Added support for new boards: Seeed Arch BLE, Seeed Arch Link, Switch
+    Science mbed TY51822r3, y5 nRF51822 mbug, JKSoft Wallbot BLE
+
+* Development platform `NXP LPC <https://github.com/platformio/platform-nxplpc>`__
+
+  + Added support for new boards: ARM mbed LPC11U24 (+CAN), Bambino-210E,
+    CoCo-ri-Co!, DipCortex M3, LPCXpresso11U68, LPCXpresso824-MAX, mBuino,
+    MicroNFCBoard, NXP LPC11C24, NXP LPC11U34, EA LPC11U35 QuickStart Board,
+    NXP LPC11U37, NXP LPC2368, NXP LPC2460, NXP LPC800-MAX, Seeed Arch GPRS V2,
+    Seeed Xadow M0, Smeshlink xbed LPC1768, Switch Science mbed LPC824
+
+* Development platform `ST STM32 <https://github.com/platformio/platform-ststm32>`__
+
+  + New Arduino framework for ST STM32 -
+    `STM32Duino <https://github.com/rogerclarkmelbourne/Arduino_STM32>`__.
+    Supported boards: BluePill F103C8, Generic STM32F103C8, Generic STM32F103R8,
+    Generic STM32F103RB, Generic STM32F103RC, Generic STM32F103RE, Olimexino STM32
+
+  + Added support for new ARM mbed based boards: ST 32F746GDISCOVER,
+    MultiTech mDot, ST Nucleo F207ZG, ST Nucleo F429ZI, ST Nucleo F446ZE,
+    ST Nucleo F746ZG, ST Nucleo F767ZI, ST Nucleo L011K4, ST Nucleo L432KC,
+    Seeed Arch Max
+
 * Development platform `Teensy <https://github.com/platformio/platform-teensy>`__
 
   + Added support for Teensy 3.5 and 3.6 boards
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 611760c9..3f48a7c4 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -45,6 +45,9 @@ Platforms
     * - :ref:`platform_nordicnrf51`
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
     * - :ref:`platform_teensy`
       - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
 
@@ -856,7 +859,7 @@ Espressif
       - ESP8266
       - 80 MHz
       - 4096 Kb
-      - 50 Kb
+      - 80 Kb
 
     * - ``phoenix_v1``
       - `Phoenix 1.0 <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`_
@@ -906,6 +909,68 @@ Fubarino
       - 512 Kb
       - 128 Kb
 
+Generic
+~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``bluepill_f103c8``
+      - `BluePill F103C8 <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html>`_
+      - STM32F103C8T6
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103C8``
+      - `STM32F103C8 (20k RAM. 64k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html>`_
+      - STM32F103C8
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103CB``
+      - `STM32F103CB (20k RAM. 128k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103cb.html>`_
+      - STM32F103CB
+      - 72 MHz
+      - 128 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103R8``
+      - `STM32F103R8 (20k RAM. 64 Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103r8.html>`_
+      - STM32F103R8
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103RB``
+      - `STM32F103RB (20k RAM. 128k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rb.html>`_
+      - STM32F103RB
+      - 72 MHz
+      - 128 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103RC``
+      - `STM32F103RC (48k RAM. 256k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rc.html>`_
+      - STM32F103RC
+      - 72 MHz
+      - 256 Kb
+      - 48 Kb
+
+    * - ``genericSTM32F103RE``
+      - `STM32F103RE (64k RAM. 512k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103re.html>`_
+      - STM32F103RE
+      - 72 MHz
+      - 512 Kb
+      - 64 Kb
+
 Generic ATTiny
 ~~~~~~~~~~~~~~
 
@@ -1233,6 +1298,13 @@ Olimex
       - Flash
       - RAM
 
+    * - ``maple``
+      - `Olimexino STM32 <https://www.olimex.com/Products/Duino/STM32/OLIMEXINO-STM32/>`_
+      - STM32F103RB_MAPLE
+      - 72 MHz
+      - 128 Kb
+      - 16.6015625 Kb
+
     * - ``modwifi``
       - `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
       - ESP8266
@@ -1594,7 +1666,7 @@ SparkFun
       - `SparkFun Blynk Board <https://www.sparkfun.com/products/13794>`_
       - ESP8266
       - 80 MHz
-      - 1024 Kb
+      - 4096 Kb
       - 80 Kb
 
     * - ``sparkfun_digitalsandbox``
@@ -1756,6 +1828,20 @@ Teensy
       - 256 Kb
       - 64 Kb
 
+    * - ``teensy35``
+      - `Teensy 3.5 <https://www.pjrc.com>`_
+      - MK64FX512
+      - 120 MHz
+      - 512 Kb
+      - 192 Kb
+
+    * - ``teensy36``
+      - `Teensy 3.6 <https://www.pjrc.com>`_
+      - MK66FX1M0
+      - 180 MHz
+      - 1024 Kb
+      - 256 Kb
+
     * - ``teensylc``
       - `Teensy LC <http://www.pjrc.com/teensy/teensyLC.html>`_
       - MKL26Z64
diff --git a/docs/frameworks/mbed.rst b/docs/frameworks/mbed.rst
index fb45d9a6..7a408511 100644
--- a/docs/frameworks/mbed.rst
+++ b/docs/frameworks/mbed.rst
@@ -170,6 +170,26 @@ Delta
       - 256 Kb
       - 32 Kb
 
+Elektor Labs
+~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``elektor_cocorico``
+      - `CoCo-ri-Co! <https://developer.mbed.org/platforms/CoCo-ri-Co/>`_
+      - LPC812
+      - 30 MHz
+      - 16 Kb
+      - 4 Kb
+
 Embedded Artists
 ~~~~~~~~~~~~~~~~
 
@@ -184,7 +204,7 @@ Embedded Artists
       - RAM
 
     * - ``lpc11u35``
-      - `Embedded Artists LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
+      - `EA LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
       - LPC11U35
       - 48 MHz
       - 64 Kb
@@ -259,6 +279,27 @@ Freescale
       - 128 Kb
       - 16 Kb
 
+    * - ``frdm_kl26z``
+      - `Freescale Kinetis FRDM-KL26Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl16-and-kl26-mcus-up-to-128-kb-flash:FRDM-KL26Z>`_
+      - MKL26Z128VLH4
+      - 48 MHz
+      - 128 Kb
+      - 16 Kb
+
+    * - ``frdm_kl27z``
+      - `Freescale Kinetis FRDM-KL27Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl17-and-kl27-mcus:FRDM-KL27Z>`_
+      - MKL27Z64VLH4
+      - 48 MHz
+      - 64 Kb
+      - 16 Kb
+
+    * - ``frdm_kl43z``
+      - `Freescale Kinetis FRDM-KL43Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl43-kl33-kl27-kl17-and-kl13-mcus:FRDM-KL43Z>`_
+      - MKL43Z256VLH4
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
     * - ``frdm_kl46z``
       - `Freescale Kinetis FRDM-KL46Z <https://developer.mbed.org/platforms/FRDM-KL46Z/>`_
       - MKL46Z256VLL4
@@ -266,6 +307,26 @@ Freescale
       - 256 Kb
       - 32 Kb
 
+GHI Electronics
+~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``oc_mbuino``
+      - `mBuino <https://developer.mbed.org/platforms/mBuino/>`_
+      - LPC11U24
+      - 50 MHz
+      - 32 Kb
+      - 10 Kb
+
 Generic
 ~~~~~~~
 
@@ -299,13 +360,53 @@ JKSoft
       - Flash
       - RAM
 
-    * - ``wallBotBLE``
+    * - ``wallbot_ble``
       - `JKSoft Wallbot BLE <https://developer.mbed.org/platforms/JKSoft-Wallbot-BLE/>`_
       - NRF51822
       - 16 MHz
       - 128 Kb
       - 16 Kb
 
+Micromint
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc4330_m4``
+      - `Bambino-210E <https://developer.mbed.org/platforms/Micromint-Bambino-210E/>`_
+      - LPC4330
+      - 204 MHz
+      - 8192 Kb
+      - 264 Kb
+
+MikroElektronika
+~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``hexiwear``
+      - `Hexiwear <https://developer.mbed.org/platforms/Hexiwear/>`_
+      - MK64FN1M0VDC12
+      - 120 MHz
+      - 1024 Kb
+      - 256 Kb
+
 MultiTech
 ~~~~~~~~~
 
@@ -319,6 +420,13 @@ MultiTech
       - Flash
       - RAM
 
+    * - ``mts_mdot_f405rg``
+      - `MultiTech mDot <https://developer.mbed.org/platforms/MTS-mDot-F411/>`_
+      - STM32F411RET6
+      - 100 MHz
+      - 512 Kb
+      - 128 Kb
+
     * - ``mts_mdot_f411re``
       - `MultiTech mDot F411 <https://developer.mbed.org/platforms/MTS-mDot-F411/>`_
       - STM32F411RET6
@@ -359,6 +467,13 @@ NXP
       - Flash
       - RAM
 
+    * - ``lpc11c24``
+      - `NXP LPC11C24 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/scalable-entry-level-32-bit-microcontroller-mcu-based-on-arm-cortex-m0-plus-m0-cores:LPC11C24FBD48>`_
+      - LPC11C24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+
     * - ``lpc11u24``
       - `NXP mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
       - LPC11U24
@@ -366,6 +481,34 @@ NXP
       - 32 Kb
       - 8 Kb
 
+    * - ``lpc11u24_301``
+      - `ARM mbed LPC11U24 (+CAN) <https://developer.mbed.org/handbook/mbed-NXP-LPC11U24>`_
+      - LPC11U24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``lpc11u34_421``
+      - `NXP LPC11U34 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/40kb-flash-8kb-sram-lqfp48-package:LPC11U34FBD48?lang_cd=en>`_
+      - LPC11U34
+      - 48 MHz
+      - 64 Kb
+      - 8 Kb
+
+    * - ``lpc11u37_501``
+      - `NXP LPC11U37 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/128kb-flash-10kb-sram-lqfp48-package:LPC11U37FBD48?lang_cd=en>`_
+      - LPC11U37
+      - 48 MHz
+      - 128 Kb
+      - 10 Kb
+
+    * - ``lpc11u68``
+      - `LPCXpresso11U68 <https://developer.mbed.org/platforms/LPCXpresso11U68/>`_
+      - LPC11U68
+      - 50 MHz
+      - 256 Kb
+      - 36 Kb
+
     * - ``lpc1549``
       - `NXP LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
       - LPC1549
@@ -380,6 +523,41 @@ NXP
       - 512 Kb
       - 64 Kb
 
+    * - ``lpc2368``
+      - `NXP LPC2368 <https://developer.mbed.org/platforms/mbed-LPC2368/>`_
+      - LPC2368
+      - 72 MHz
+      - 512 Kb
+      - 58 Kb
+
+    * - ``lpc2460``
+      - `NXP LPC2460 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-arm7-arm9-mcus/lpc-arm7-mcus/lpc2100-200-300-400/flashless-16-bit-32-bit-microcontroller-ethernet-can-isp-iap-usb-2.0-device-host-otg-external-memory-interface:LPC2460FBD208>`_
+      - LPC2460
+      - 72 MHz
+      - 64 Kb
+      - 16 Kb
+
+    * - ``lpc812``
+      - `NXP LPC800-MAX <https://developer.mbed.org/platforms/NXP-LPC800-MAX/>`_
+      - LPC812
+      - 30 MHz
+      - 16 Kb
+      - 4 Kb
+
+    * - ``lpc824``
+      - `LPCXpresso824-MAX <https://developer.mbed.org/platforms/LPCXpresso824-MAX/>`_
+      - LPC824
+      - 30 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``micronfcboard``
+      - `MicroNFCBoard <https://developer.mbed.org/platforms/MicroNFCBoard/>`_
+      - LPC11U34
+      - 48 MHz
+      - 64 Kb
+      - 10 Kb
+
 Nordic
 ~~~~~~
 
@@ -530,6 +708,13 @@ ST
       - 1024 Kb
       - 384 Kb
 
+    * - ``disco_f746ng``
+      - `ST 32F746GDISCOVERY <http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f746gdiscovery.html>`_
+      - STM32F746NGH6
+      - 216 MHz
+      - 1024 Kb
+      - 320 Kb
+
     * - ``disco_l053c8``
       - `ST 32L0538DISCOVERY <http://www.st.com/web/en/catalog/tools/PF260319>`_
       - STM32L053C8T6
@@ -593,6 +778,13 @@ ST
       - 128 Kb
       - 20 Kb
 
+    * - ``nucleo_f207zg``
+      - `ST Nucleo F207ZG <https://developer.mbed.org/platforms/ST-Nucleo-F207ZG/>`_
+      - STM32F207ZGT6
+      - 120 MHz
+      - 1024 Kb
+      - 128 Kb
+
     * - ``nucleo_f302r8``
       - `ST Nucleo F302R8 <https://developer.mbed.org/platforms/ST-Nucleo-F302R8/>`_
       - STM32F302R8T6
@@ -642,6 +834,13 @@ ST
       - 512 Kb
       - 128 Kb
 
+    * - ``nucleo_f429zi``
+      - `ST Nucleo F429ZI <https://developer.mbed.org/platforms/ST-Nucleo-F429ZI/>`_
+      - STM32F429ZIT6
+      - 180 MHz
+      - 2048 Kb
+      - 256 Kb
+
     * - ``nucleo_f446re``
       - `ST Nucleo F446RE <https://developer.mbed.org/platforms/ST-Nucleo-F446RE/>`_
       - STM32F446RET6
@@ -649,6 +848,34 @@ ST
       - 512 Kb
       - 128 Kb
 
+    * - ``nucleo_f446ze``
+      - `ST Nucleo F446ZE <https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/>`_
+      - STM32F446ZET6
+      - 180 MHz
+      - 512 Kb
+      - 128 Kb
+
+    * - ``nucleo_f746zg``
+      - `ST Nucleo F746ZG <https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/>`_
+      - STM32F746ZGT6
+      - 216 MHz
+      - 1024 Kb
+      - 320 Kb
+
+    * - ``nucleo_f767zi``
+      - `ST Nucleo F767ZI <https://developer.mbed.org/platforms/ST-Nucleo-F767ZI/>`_
+      - STM32F746ZGT6
+      - 216 MHz
+      - 2048 Kb
+      - 512 Kb
+
+    * - ``nucleo_l011k4``
+      - `ST Nucleo L011K4 <https://developer.mbed.org/platforms/ST-Nucleo-L011K4/>`_
+      - STM32L011K4T6
+      - 32 MHz
+      - 16 Kb
+      - 2 Kb
+
     * - ``nucleo_l031k6``
       - `ST Nucleo L031K6 <https://developer.mbed.org/platforms/ST-Nucleo-L031K6/>`_
       - STM32L031K6T6
@@ -677,6 +904,13 @@ ST
       - 512 Kb
       - 80 Kb
 
+    * - ``nucleo_l432kc``
+      - `ST Nucleo L432KC <https://developer.mbed.org/platforms/ST-Nucleo-L432KC/>`_
+      - STM32L432KCU6
+      - 80 MHz
+      - 256 Kb
+      - 64 Kb
+
     * - ``nucleo_l476rg``
       - `ST Nucleo L476RG <https://developer.mbed.org/platforms/ST-Nucleo-L476RG/>`_
       - STM32L476RGT6
@@ -697,27 +931,55 @@ SeeedStudio
       - Flash
       - RAM
 
-    * - ``seeedArchMax``
-      - `SeeedStudio Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
-      - STM32F407VET6
-      - 168 MHz
-      - 512 Kb
-      - 192 Kb
+    * - ``seeedArchBLE``
+      - `Seeed Arch BLE <https://developer.mbed.org/platforms/Seeed-Arch-BLE/>`_
+      - NRF51822
+      - 16 MHz
+      - 128 Kb
+      - 16 Kb
 
-    * - ``seeedTinyBLE``
-      - `SeeedStudio Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
+    * - ``seeedArchGPRS``
+      - `Seeed Arch GPRS V2 <https://www.seeedstudio.com/Arch-GPRS-V2-p-2026.html>`_
+      - LPC11U37
+      - 48 MHz
+      - 128 Kb
+      - 10 Kb
+
+    * - ``seeedArchLink``
+      - `Seeed Arch Link <https://developer.mbed.org/platforms/Seeed-Arch-Link/>`_
       - NRF51822
       - 16 MHz
       - 256 Kb
       - 16 Kb
 
-    * - ``seeeduinoArchPro``
-      - `SeeedStudio Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
+    * - ``seeedArchMax``
+      - `Seeed Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
+      - STM32F407VET6
+      - 168 MHz
+      - 512 Kb
+      - 192 Kb
+
+    * - ``seeedArchPro``
+      - `Seeed Arch Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
       - LPC1768
       - 96 MHz
       - 512 Kb
       - 64 Kb
 
+    * - ``seeedTinyBLE``
+      - `Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
+
+    * - ``xadow_m0``
+      - `Seeed Xadow M0 <https://developer.mbed.org/platforms/Seeed-Xadow-M0/>`_
+      - LPC11U35
+      - 48 MHz
+      - 64 Kb
+      - 10 Kb
+
 Silicon Labs
 ~~~~~~~~~~~~
 
@@ -773,6 +1035,26 @@ Silicon Labs
       - 32 Kb
       - 4 Kb
 
+Smeshlink
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``xbed_lpc1768``
+      - `Smeshlink xbed LPC1768 <https://developer.mbed.org/platforms/xbed-LPC1768/>`_
+      - LPC1768
+      - 96 MHz
+      - 512 Kb
+      - 32 Kb
+
 Solder Splash Labs
 ~~~~~~~~~~~~~~~~~~
 
@@ -793,6 +1075,26 @@ Solder Splash Labs
       - 32 Kb
       - 8 Kb
 
+SolderSplash Labs
+~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc1347``
+      - `DipCortex M3 <https://developer.mbed.org/platforms/DipCortex-M3/>`_
+      - LPC1347
+      - 72 MHz
+      - 64 Kb
+      - 12 Kb
+
 Switch Science
 ~~~~~~~~~~~~~~
 
@@ -820,6 +1122,20 @@ Switch Science
       - 32 Kb
       - 4 Kb
 
+    * - ``ssci824``
+      - `Switch Science mbed LPC824 <https://developer.mbed.org/platforms/Switch-Science-mbed-LPC824/>`_
+      - LPC824
+      - 30 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``ty51822r3``
+      - `Switch Science mbed TY51822r3 <https://developer.mbed.org/platforms/Switch-Science-mbed-TY51822r3/>`_
+      - NRF51822
+      - 32 MHz
+      - 256 Kb
+      - 32 Kb
+
 Teensy
 ~~~~~~
 
@@ -860,4 +1176,24 @@ u-blox
       - 512 Kb
       - 64 Kb
 
+y5 design
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``nrf51822_y5_mbug``
+      - `y5 nRF51822 mbug <https://developer.mbed.org/platforms/Y5-NRF51822-MBUG/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
+
 .. include:: mbed_extra.rst
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 88d545f0..798dfd6f 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -40,9 +40,6 @@ Packages
     * - ``tool-micronucleus``
       - `Micronucleus <https://github.com/micronucleus/micronucleus>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-atmelavr``
       - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_, `GDB <http://www.gnu.org/software/gdb/>`_, `AVaRICE <http://avarice.sourceforge.net/>`_, `SimulAVR <http://www.nongnu.org/simulavr/>`_
 
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index a73ab057..e4bf5842 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -46,9 +46,6 @@ Packages
     * - ``tool-openocd``
       - `OpenOCD <http://openocd.org>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index 44fe48f0..5118fcd1 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -74,6 +74,9 @@ Packages
     * - ``framework-arduinosam``
       - `Arduino Wiring-based Framework (SAM Core, 1.6) <http://arduino.cc/en/Reference/HomePage>`_
 
+    * - ``framework-arduinoststm32``
+      - `Arduino Wiring-based Framework (STM32 Core) <https://github.com/rogerclarkmelbourne/Arduino_STM32>`_
+
     * - ``framework-arduinoteensy``
       - `Arduino Wiring-based Framework <http://arduino.cc/en/Reference/HomePage>`_
 
diff --git a/docs/platforms/embedded_boards.rst b/docs/platforms/embedded_boards.rst
index 7c41f96d..15ca4a6b 100644
--- a/docs/platforms/embedded_boards.rst
+++ b/docs/platforms/embedded_boards.rst
@@ -890,6 +890,26 @@ ESPino
       - 4096 Kb
       - 80 Kb
 
+Elektor Labs
+~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``elektor_cocorico``
+      - `CoCo-ri-Co! <https://developer.mbed.org/platforms/CoCo-ri-Co/>`_
+      - LPC812
+      - 30 MHz
+      - 16 Kb
+      - 4 Kb
+
 Embedded Artists
 ~~~~~~~~~~~~~~~~
 
@@ -904,7 +924,7 @@ Embedded Artists
       - RAM
 
     * - ``lpc11u35``
-      - `Embedded Artists LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
+      - `EA LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
       - LPC11U35
       - 48 MHz
       - 64 Kb
@@ -1011,7 +1031,7 @@ Espressif
       - ESP8266
       - 80 MHz
       - 4096 Kb
-      - 50 Kb
+      - 80 Kb
 
     * - ``phoenix_v1``
       - `Phoenix 1.0 <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`_
@@ -1089,6 +1109,27 @@ Freescale
       - 128 Kb
       - 16 Kb
 
+    * - ``frdm_kl26z``
+      - `Freescale Kinetis FRDM-KL26Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl16-and-kl26-mcus-up-to-128-kb-flash:FRDM-KL26Z>`_
+      - MKL26Z128VLH4
+      - 48 MHz
+      - 128 Kb
+      - 16 Kb
+
+    * - ``frdm_kl27z``
+      - `Freescale Kinetis FRDM-KL27Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl17-and-kl27-mcus:FRDM-KL27Z>`_
+      - MKL27Z64VLH4
+      - 48 MHz
+      - 64 Kb
+      - 16 Kb
+
+    * - ``frdm_kl43z``
+      - `Freescale Kinetis FRDM-KL43Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl43-kl33-kl27-kl17-and-kl13-mcus:FRDM-KL43Z>`_
+      - MKL43Z256VLH4
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
     * - ``frdm_kl46z``
       - `Freescale Kinetis FRDM-KL46Z <https://developer.mbed.org/platforms/FRDM-KL46Z/>`_
       - MKL46Z256VLL4
@@ -1123,6 +1164,26 @@ Fubarino
       - 512 Kb
       - 128 Kb
 
+GHI Electronics
+~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``oc_mbuino``
+      - `mBuino <https://developer.mbed.org/platforms/mBuino/>`_
+      - LPC11U24
+      - 50 MHz
+      - 32 Kb
+      - 10 Kb
+
 Generic
 ~~~~~~~
 
@@ -1143,6 +1204,48 @@ Generic
       - 64 Kb
       - 20 Kb
 
+    * - ``genericSTM32F103C8``
+      - `STM32F103C8 (20k RAM. 64k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html>`_
+      - STM32F103C8
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103CB``
+      - `STM32F103CB (20k RAM. 128k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103cb.html>`_
+      - STM32F103CB
+      - 72 MHz
+      - 128 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103R8``
+      - `STM32F103R8 (20k RAM. 64 Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103r8.html>`_
+      - STM32F103R8
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103RB``
+      - `STM32F103RB (20k RAM. 128k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rb.html>`_
+      - STM32F103RB
+      - 72 MHz
+      - 128 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103RC``
+      - `STM32F103RC (48k RAM. 256k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rc.html>`_
+      - STM32F103RC
+      - 72 MHz
+      - 256 Kb
+      - 48 Kb
+
+    * - ``genericSTM32F103RE``
+      - `STM32F103RE (64k RAM. 512k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103re.html>`_
+      - STM32F103RE
+      - 72 MHz
+      - 512 Kb
+      - 64 Kb
+
 Generic ATTiny
 ~~~~~~~~~~~~~~
 
@@ -1238,7 +1341,7 @@ JKSoft
       - Flash
       - RAM
 
-    * - ``wallBotBLE``
+    * - ``wallbot_ble``
       - `JKSoft Wallbot BLE <https://developer.mbed.org/platforms/JKSoft-Wallbot-BLE/>`_
       - NRF51822
       - 16 MHz
@@ -1470,6 +1573,46 @@ Microduino
       - 64 Kb
       - 4 Kb
 
+Micromint
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc4330_m4``
+      - `Bambino-210E <https://developer.mbed.org/platforms/Micromint-Bambino-210E/>`_
+      - LPC4330
+      - 204 MHz
+      - 8192 Kb
+      - 264 Kb
+
+MikroElektronika
+~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``hexiwear``
+      - `Hexiwear <https://developer.mbed.org/platforms/Hexiwear/>`_
+      - MK64FN1M0VDC12
+      - 120 MHz
+      - 1024 Kb
+      - 256 Kb
+
 MultiTech
 ~~~~~~~~~
 
@@ -1483,6 +1626,13 @@ MultiTech
       - Flash
       - RAM
 
+    * - ``mts_mdot_f405rg``
+      - `MultiTech mDot <https://developer.mbed.org/platforms/MTS-mDot-F411/>`_
+      - STM32F411RET6
+      - 100 MHz
+      - 512 Kb
+      - 128 Kb
+
     * - ``mts_mdot_f411re``
       - `MultiTech mDot F411 <https://developer.mbed.org/platforms/MTS-mDot-F411/>`_
       - STM32F411RET6
@@ -1523,6 +1673,13 @@ NXP
       - Flash
       - RAM
 
+    * - ``lpc11c24``
+      - `NXP LPC11C24 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/scalable-entry-level-32-bit-microcontroller-mcu-based-on-arm-cortex-m0-plus-m0-cores:LPC11C24FBD48>`_
+      - LPC11C24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+
     * - ``lpc11u24``
       - `NXP mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
       - LPC11U24
@@ -1530,6 +1687,34 @@ NXP
       - 32 Kb
       - 8 Kb
 
+    * - ``lpc11u24_301``
+      - `ARM mbed LPC11U24 (+CAN) <https://developer.mbed.org/handbook/mbed-NXP-LPC11U24>`_
+      - LPC11U24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``lpc11u34_421``
+      - `NXP LPC11U34 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/40kb-flash-8kb-sram-lqfp48-package:LPC11U34FBD48?lang_cd=en>`_
+      - LPC11U34
+      - 48 MHz
+      - 64 Kb
+      - 8 Kb
+
+    * - ``lpc11u37_501``
+      - `NXP LPC11U37 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/128kb-flash-10kb-sram-lqfp48-package:LPC11U37FBD48?lang_cd=en>`_
+      - LPC11U37
+      - 48 MHz
+      - 128 Kb
+      - 10 Kb
+
+    * - ``lpc11u68``
+      - `LPCXpresso11U68 <https://developer.mbed.org/platforms/LPCXpresso11U68/>`_
+      - LPC11U68
+      - 50 MHz
+      - 256 Kb
+      - 36 Kb
+
     * - ``lpc1549``
       - `NXP LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
       - LPC1549
@@ -1544,6 +1729,41 @@ NXP
       - 512 Kb
       - 64 Kb
 
+    * - ``lpc2368``
+      - `NXP LPC2368 <https://developer.mbed.org/platforms/mbed-LPC2368/>`_
+      - LPC2368
+      - 72 MHz
+      - 512 Kb
+      - 58 Kb
+
+    * - ``lpc2460``
+      - `NXP LPC2460 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-arm7-arm9-mcus/lpc-arm7-mcus/lpc2100-200-300-400/flashless-16-bit-32-bit-microcontroller-ethernet-can-isp-iap-usb-2.0-device-host-otg-external-memory-interface:LPC2460FBD208>`_
+      - LPC2460
+      - 72 MHz
+      - 64 Kb
+      - 16 Kb
+
+    * - ``lpc812``
+      - `NXP LPC800-MAX <https://developer.mbed.org/platforms/NXP-LPC800-MAX/>`_
+      - LPC812
+      - 30 MHz
+      - 16 Kb
+      - 4 Kb
+
+    * - ``lpc824``
+      - `LPCXpresso824-MAX <https://developer.mbed.org/platforms/LPCXpresso824-MAX/>`_
+      - LPC824
+      - 30 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``micronfcboard``
+      - `MicroNFCBoard <https://developer.mbed.org/platforms/MicroNFCBoard/>`_
+      - LPC11U34
+      - 48 MHz
+      - 64 Kb
+      - 10 Kb
+
 NodeMCU
 ~~~~~~~
 
@@ -1618,6 +1838,13 @@ Olimex
       - Flash
       - RAM
 
+    * - ``maple``
+      - `Olimexino STM32 <https://www.olimex.com/Products/Duino/STM32/OLIMEXINO-STM32/>`_
+      - STM32F103RB_MAPLE
+      - 72 MHz
+      - 128 Kb
+      - 16.6015625 Kb
+
     * - ``modwifi``
       - `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
       - ESP8266
@@ -1997,6 +2224,13 @@ ST
       - 1024 Kb
       - 384 Kb
 
+    * - ``disco_f746ng``
+      - `ST 32F746GDISCOVERY <http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f746gdiscovery.html>`_
+      - STM32F746NGH6
+      - 216 MHz
+      - 1024 Kb
+      - 320 Kb
+
     * - ``disco_l053c8``
       - `ST 32L0538DISCOVERY <http://www.st.com/web/en/catalog/tools/PF260319>`_
       - STM32L053C8T6
@@ -2067,6 +2301,13 @@ ST
       - 128 Kb
       - 20 Kb
 
+    * - ``nucleo_f207zg``
+      - `ST Nucleo F207ZG <https://developer.mbed.org/platforms/ST-Nucleo-F207ZG/>`_
+      - STM32F207ZGT6
+      - 120 MHz
+      - 1024 Kb
+      - 128 Kb
+
     * - ``nucleo_f302r8``
       - `ST Nucleo F302R8 <https://developer.mbed.org/platforms/ST-Nucleo-F302R8/>`_
       - STM32F302R8T6
@@ -2116,6 +2357,13 @@ ST
       - 512 Kb
       - 128 Kb
 
+    * - ``nucleo_f429zi``
+      - `ST Nucleo F429ZI <https://developer.mbed.org/platforms/ST-Nucleo-F429ZI/>`_
+      - STM32F429ZIT6
+      - 180 MHz
+      - 2048 Kb
+      - 256 Kb
+
     * - ``nucleo_f446re``
       - `ST Nucleo F446RE <https://developer.mbed.org/platforms/ST-Nucleo-F446RE/>`_
       - STM32F446RET6
@@ -2123,6 +2371,34 @@ ST
       - 512 Kb
       - 128 Kb
 
+    * - ``nucleo_f446ze``
+      - `ST Nucleo F446ZE <https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/>`_
+      - STM32F446ZET6
+      - 180 MHz
+      - 512 Kb
+      - 128 Kb
+
+    * - ``nucleo_f746zg``
+      - `ST Nucleo F746ZG <https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/>`_
+      - STM32F746ZGT6
+      - 216 MHz
+      - 1024 Kb
+      - 320 Kb
+
+    * - ``nucleo_f767zi``
+      - `ST Nucleo F767ZI <https://developer.mbed.org/platforms/ST-Nucleo-F767ZI/>`_
+      - STM32F746ZGT6
+      - 216 MHz
+      - 2048 Kb
+      - 512 Kb
+
+    * - ``nucleo_l011k4``
+      - `ST Nucleo L011K4 <https://developer.mbed.org/platforms/ST-Nucleo-L011K4/>`_
+      - STM32L011K4T6
+      - 32 MHz
+      - 16 Kb
+      - 2 Kb
+
     * - ``nucleo_l031k6``
       - `ST Nucleo L031K6 <https://developer.mbed.org/platforms/ST-Nucleo-L031K6/>`_
       - STM32L031K6T6
@@ -2151,6 +2427,13 @@ ST
       - 512 Kb
       - 80 Kb
 
+    * - ``nucleo_l432kc``
+      - `ST Nucleo L432KC <https://developer.mbed.org/platforms/ST-Nucleo-L432KC/>`_
+      - STM32L432KCU6
+      - 80 MHz
+      - 256 Kb
+      - 64 Kb
+
     * - ``nucleo_l476rg``
       - `ST Nucleo L476RG <https://developer.mbed.org/platforms/ST-Nucleo-L476RG/>`_
       - STM32L476RGT6
@@ -2260,27 +2543,55 @@ SeeedStudio
       - 512 Kb
       - 128 Kb
 
-    * - ``seeedArchMax``
-      - `SeeedStudio Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
-      - STM32F407VET6
-      - 168 MHz
-      - 512 Kb
-      - 192 Kb
+    * - ``seeedArchBLE``
+      - `Seeed Arch BLE <https://developer.mbed.org/platforms/Seeed-Arch-BLE/>`_
+      - NRF51822
+      - 16 MHz
+      - 128 Kb
+      - 16 Kb
 
-    * - ``seeedTinyBLE``
-      - `SeeedStudio Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
+    * - ``seeedArchGPRS``
+      - `Seeed Arch GPRS V2 <https://www.seeedstudio.com/Arch-GPRS-V2-p-2026.html>`_
+      - LPC11U37
+      - 48 MHz
+      - 128 Kb
+      - 10 Kb
+
+    * - ``seeedArchLink``
+      - `Seeed Arch Link <https://developer.mbed.org/platforms/Seeed-Arch-Link/>`_
       - NRF51822
       - 16 MHz
       - 256 Kb
       - 16 Kb
 
-    * - ``seeeduinoArchPro``
-      - `SeeedStudio Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
+    * - ``seeedArchMax``
+      - `Seeed Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
+      - STM32F407VET6
+      - 168 MHz
+      - 512 Kb
+      - 192 Kb
+
+    * - ``seeedArchPro``
+      - `Seeed Arch Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
       - LPC1768
       - 96 MHz
       - 512 Kb
       - 64 Kb
 
+    * - ``seeedTinyBLE``
+      - `Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
+
+    * - ``xadow_m0``
+      - `Seeed Xadow M0 <https://developer.mbed.org/platforms/Seeed-Xadow-M0/>`_
+      - LPC11U35
+      - 48 MHz
+      - 64 Kb
+      - 10 Kb
+
 Silicon Labs
 ~~~~~~~~~~~~
 
@@ -2336,6 +2647,26 @@ Silicon Labs
       - 32 Kb
       - 4 Kb
 
+Smeshlink
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``xbed_lpc1768``
+      - `Smeshlink xbed LPC1768 <https://developer.mbed.org/platforms/xbed-LPC1768/>`_
+      - LPC1768
+      - 96 MHz
+      - 512 Kb
+      - 32 Kb
+
 Solder Splash Labs
 ~~~~~~~~~~~~~~~~~~
 
@@ -2356,6 +2687,26 @@ Solder Splash Labs
       - 32 Kb
       - 8 Kb
 
+SolderSplash Labs
+~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc1347``
+      - `DipCortex M3 <https://developer.mbed.org/platforms/DipCortex-M3/>`_
+      - LPC1347
+      - 72 MHz
+      - 64 Kb
+      - 12 Kb
+
 SparkFun
 ~~~~~~~~
 
@@ -2373,7 +2724,7 @@ SparkFun
       - `SparkFun Blynk Board <https://www.sparkfun.com/products/13794>`_
       - ESP8266
       - 80 MHz
-      - 1024 Kb
+      - 4096 Kb
       - 80 Kb
 
     * - ``sparkfun_digitalsandbox``
@@ -2521,6 +2872,20 @@ Switch Science
       - 32 Kb
       - 4 Kb
 
+    * - ``ssci824``
+      - `Switch Science mbed LPC824 <https://developer.mbed.org/platforms/Switch-Science-mbed-LPC824/>`_
+      - LPC824
+      - 30 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``ty51822r3``
+      - `Switch Science mbed TY51822r3 <https://developer.mbed.org/platforms/Switch-Science-mbed-TY51822r3/>`_
+      - NRF51822
+      - 32 MHz
+      - 256 Kb
+      - 32 Kb
+
 TI
 ~~
 
@@ -2659,6 +3024,20 @@ Teensy
       - 256 Kb
       - 64 Kb
 
+    * - ``teensy35``
+      - `Teensy 3.5 <https://www.pjrc.com>`_
+      - MK64FX512
+      - 120 MHz
+      - 512 Kb
+      - 192 Kb
+
+    * - ``teensy36``
+      - `Teensy 3.6 <https://www.pjrc.com>`_
+      - MK66FX1M0
+      - 180 MHz
+      - 1024 Kb
+      - 256 Kb
+
     * - ``teensylc``
       - `Teensy LC <http://www.pjrc.com/teensy/teensyLC.html>`_
       - MKL26Z64
@@ -2873,3 +3252,23 @@ ubIQio
       - 16 MHz
       - 32 Kb
       - 2 Kb
+
+y5 design
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``nrf51822_y5_mbug``
+      - `y5 nRF51822 mbug <https://developer.mbed.org/platforms/Y5-NRF51822-MBUG/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
diff --git a/docs/platforms/espressif8266.rst b/docs/platforms/espressif8266.rst
index 3aaaa249..53d6214b 100644
--- a/docs/platforms/espressif8266.rst
+++ b/docs/platforms/espressif8266.rst
@@ -43,9 +43,6 @@ Packages
     * - ``tool-mkspiffs``
       - `Tool to build and unpack SPIFFS images <https://github.com/igrr/mkspiffs>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-xtensa``
       - `xtensa-gcc <https://github.com/jcmvbkbc/gcc-xtensa>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
@@ -222,7 +219,7 @@ Espressif
       - ESP8266
       - 80 MHz
       - 4096 Kb
-      - 50 Kb
+      - 80 Kb
 
     * - ``phoenix_v1``
       - `Phoenix 1.0 <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`_
@@ -309,7 +306,7 @@ SparkFun
       - `SparkFun Blynk Board <https://www.sparkfun.com/products/13794>`_
       - ESP8266
       - 80 MHz
-      - 1024 Kb
+      - 4096 Kb
       - 80 Kb
 
     * - ``thing``
diff --git a/docs/platforms/freescalekinetis.rst b/docs/platforms/freescalekinetis.rst
index 29323287..494e8527 100644
--- a/docs/platforms/freescalekinetis.rst
+++ b/docs/platforms/freescalekinetis.rst
@@ -31,9 +31,6 @@ Packages
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
@@ -122,9 +119,50 @@ Freescale
       - 128 Kb
       - 16 Kb
 
+    * - ``frdm_kl26z``
+      - `Freescale Kinetis FRDM-KL26Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl16-and-kl26-mcus-up-to-128-kb-flash:FRDM-KL26Z>`_
+      - MKL26Z128VLH4
+      - 48 MHz
+      - 128 Kb
+      - 16 Kb
+
+    * - ``frdm_kl27z``
+      - `Freescale Kinetis FRDM-KL27Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl17-and-kl27-mcus:FRDM-KL27Z>`_
+      - MKL27Z64VLH4
+      - 48 MHz
+      - 64 Kb
+      - 16 Kb
+
+    * - ``frdm_kl43z``
+      - `Freescale Kinetis FRDM-KL43Z <http://www.nxp.com/products/software-and-tools/hardware-development-tools/freedom-development-boards/freedom-development-platform-for-kinetis-kl43-kl33-kl27-kl17-and-kl13-mcus:FRDM-KL43Z>`_
+      - MKL43Z256VLH4
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
     * - ``frdm_kl46z``
       - `Freescale Kinetis FRDM-KL46Z <https://developer.mbed.org/platforms/FRDM-KL46Z/>`_
       - MKL46Z256VLL4
       - 48 MHz
       - 256 Kb
       - 32 Kb
+
+MikroElektronika
+~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``hexiwear``
+      - `Hexiwear <https://developer.mbed.org/platforms/Hexiwear/>`_
+      - MK64FN1M0VDC12
+      - 120 MHz
+      - 1024 Kb
+      - 256 Kb
diff --git a/docs/platforms/intel_arc32.rst b/docs/platforms/intel_arc32.rst
index dbfe8f16..3127fd76 100644
--- a/docs/platforms/intel_arc32.rst
+++ b/docs/platforms/intel_arc32.rst
@@ -34,9 +34,6 @@ Packages
     * - ``tool-arduino101load``
       - `Genuino101 uploader <https://github.com/01org/intel-arduino-tools>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-intelarc32``
       - `GCC for Intel ARC <https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain>`_
 
diff --git a/docs/platforms/lattice_ice40.rst b/docs/platforms/lattice_ice40.rst
index d4e60376..fd54c760 100644
--- a/docs/platforms/lattice_ice40.rst
+++ b/docs/platforms/lattice_ice40.rst
@@ -28,9 +28,6 @@ Packages
     * - Name
       - Contents
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-icestorm``
       - `GCC for FPGA IceStorm <http://www.clifford.at/icestorm/>`_
 
diff --git a/docs/platforms/linux_arm.rst b/docs/platforms/linux_arm.rst
index 1e01001d..0b69a2d3 100644
--- a/docs/platforms/linux_arm.rst
+++ b/docs/platforms/linux_arm.rst
@@ -31,9 +31,6 @@ Packages
     * - ``framework-wiringpi``
       - `GPIO Interface library for the Raspberry Pi <http://wiringpi.com>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gccarmlinuxgnueabi``
       - `GCC for Linux ARM GNU EABI <https://gcc.gnu.org>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
diff --git a/docs/platforms/linux_i686.rst b/docs/platforms/linux_i686.rst
index 386c8dd5..fb1f3dd7 100644
--- a/docs/platforms/linux_i686.rst
+++ b/docs/platforms/linux_i686.rst
@@ -28,8 +28,5 @@ Packages
     * - Name
       - Contents
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gcclinux32``
       - `GCC for Linux i686 <https://gcc.gnu.org>`_
\ No newline at end of file
diff --git a/docs/platforms/linux_x86_64.rst b/docs/platforms/linux_x86_64.rst
index 91068819..425f0e41 100644
--- a/docs/platforms/linux_x86_64.rst
+++ b/docs/platforms/linux_x86_64.rst
@@ -28,8 +28,5 @@ Packages
     * - Name
       - Contents
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gcclinux64``
       - `GCC for Linux x86_64 <https://gcc.gnu.org>`_
\ No newline at end of file
diff --git a/docs/platforms/microchippic32.rst b/docs/platforms/microchippic32.rst
index 91269d85..8d4cf12d 100644
--- a/docs/platforms/microchippic32.rst
+++ b/docs/platforms/microchippic32.rst
@@ -34,9 +34,6 @@ Packages
     * - ``tool-pic32prog``
       - `pic32prog <https://github.com/sergev/pic32prog>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-microchippic32``
       - `GCC for Microchip PIC32 <https://github.com/chipKIT32/chipKIT-cxx>`_
 
diff --git a/docs/platforms/native.rst b/docs/platforms/native.rst
index a6794951..a4174222 100644
--- a/docs/platforms/native.rst
+++ b/docs/platforms/native.rst
@@ -17,16 +17,4 @@ Native development platform is intended to be used for desktop OS. This platform
 
 For more detailed information please visit `vendor site <http://platformio.org/platforms/native>`_.
 
-.. contents::
-
-Packages
---------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Contents
-
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
\ No newline at end of file
+.. contents::
\ No newline at end of file
diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst
index b7f8c8d9..683bdebe 100644
--- a/docs/platforms/nordicnrf51.rst
+++ b/docs/platforms/nordicnrf51.rst
@@ -37,9 +37,6 @@ Packages
     * - ``tool-rfdloader``
       - `rfdloader <https://github.com/RFduino/RFduino>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``tool-sreccat``
       - `Merging tool <https://github.com/marcows/SRecord>`_
 
@@ -132,7 +129,7 @@ JKSoft
       - Flash
       - RAM
 
-    * - ``wallBotBLE``
+    * - ``wallbot_ble``
       - `JKSoft Wallbot BLE <https://developer.mbed.org/platforms/JKSoft-Wallbot-BLE/>`_
       - NRF51822
       - 16 MHz
@@ -233,8 +230,22 @@ SeeedStudio
       - Flash
       - RAM
 
+    * - ``seeedArchBLE``
+      - `Seeed Arch BLE <https://developer.mbed.org/platforms/Seeed-Arch-BLE/>`_
+      - NRF51822
+      - 16 MHz
+      - 128 Kb
+      - 16 Kb
+
+    * - ``seeedArchLink``
+      - `Seeed Arch Link <https://developer.mbed.org/platforms/Seeed-Arch-Link/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
+
     * - ``seeedTinyBLE``
-      - `SeeedStudio Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
+      - `Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
       - NRF51822
       - 16 MHz
       - 256 Kb
@@ -260,4 +271,31 @@ Switch Science
       - 256 Kb
       - 16 Kb
 
+    * - ``ty51822r3``
+      - `Switch Science mbed TY51822r3 <https://developer.mbed.org/platforms/Switch-Science-mbed-TY51822r3/>`_
+      - NRF51822
+      - 32 MHz
+      - 256 Kb
+      - 32 Kb
+
+y5 design
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``nrf51822_y5_mbug``
+      - `y5 nRF51822 mbug <https://developer.mbed.org/platforms/Y5-NRF51822-MBUG/>`_
+      - NRF51822
+      - 16 MHz
+      - 256 Kb
+      - 16 Kb
+
 .. include:: nordicnrf51_extra.rst
diff --git a/docs/platforms/nxplpc.rst b/docs/platforms/nxplpc.rst
index 3b76506c..e9a4764e 100644
--- a/docs/platforms/nxplpc.rst
+++ b/docs/platforms/nxplpc.rst
@@ -31,9 +31,6 @@ Packages
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
@@ -87,6 +84,26 @@ CQ Publishing
       - 64 Kb
       - 10 Kb
 
+Elektor Labs
+~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``elektor_cocorico``
+      - `CoCo-ri-Co! <https://developer.mbed.org/platforms/CoCo-ri-Co/>`_
+      - LPC812
+      - 30 MHz
+      - 16 Kb
+      - 4 Kb
+
 Embedded Artists
 ~~~~~~~~~~~~~~~~
 
@@ -101,7 +118,7 @@ Embedded Artists
       - RAM
 
     * - ``lpc11u35``
-      - `Embedded Artists LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
+      - `EA LPC11U35 QuickStart Board <https://developer.mbed.org/platforms/EA-LPC11U35/>`_
       - LPC11U35
       - 48 MHz
       - 64 Kb
@@ -121,6 +138,46 @@ Embedded Artists
       - 512 Kb
       - 96 Kb
 
+GHI Electronics
+~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``oc_mbuino``
+      - `mBuino <https://developer.mbed.org/platforms/mBuino/>`_
+      - LPC11U24
+      - 50 MHz
+      - 32 Kb
+      - 10 Kb
+
+Micromint
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc4330_m4``
+      - `Bambino-210E <https://developer.mbed.org/platforms/Micromint-Bambino-210E/>`_
+      - LPC4330
+      - 204 MHz
+      - 8192 Kb
+      - 264 Kb
+
 NGX Technologies
 ~~~~~~~~~~~~~~~~
 
@@ -154,6 +211,13 @@ NXP
       - Flash
       - RAM
 
+    * - ``lpc11c24``
+      - `NXP LPC11C24 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/scalable-entry-level-32-bit-microcontroller-mcu-based-on-arm-cortex-m0-plus-m0-cores:LPC11C24FBD48>`_
+      - LPC11C24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+
     * - ``lpc11u24``
       - `NXP mbed LPC11U24 <https://developer.mbed.org/platforms/mbed-LPC11U24/>`_
       - LPC11U24
@@ -161,6 +225,34 @@ NXP
       - 32 Kb
       - 8 Kb
 
+    * - ``lpc11u24_301``
+      - `ARM mbed LPC11U24 (+CAN) <https://developer.mbed.org/handbook/mbed-NXP-LPC11U24>`_
+      - LPC11U24
+      - 48 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``lpc11u34_421``
+      - `NXP LPC11U34 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/40kb-flash-8kb-sram-lqfp48-package:LPC11U34FBD48?lang_cd=en>`_
+      - LPC11U34
+      - 48 MHz
+      - 64 Kb
+      - 8 Kb
+
+    * - ``lpc11u37_501``
+      - `NXP LPC11U37 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-cortex-m-mcus/lpc-cortex-m0-plus-m0/lpc1100-cortex-m0-plus-m0/128kb-flash-10kb-sram-lqfp48-package:LPC11U37FBD48?lang_cd=en>`_
+      - LPC11U37
+      - 48 MHz
+      - 128 Kb
+      - 10 Kb
+
+    * - ``lpc11u68``
+      - `LPCXpresso11U68 <https://developer.mbed.org/platforms/LPCXpresso11U68/>`_
+      - LPC11U68
+      - 50 MHz
+      - 256 Kb
+      - 36 Kb
+
     * - ``lpc1549``
       - `NXP LPCXpresso1549 <https://developer.mbed.org/platforms/LPCXpresso1549/>`_
       - LPC1549
@@ -175,6 +267,41 @@ NXP
       - 512 Kb
       - 64 Kb
 
+    * - ``lpc2368``
+      - `NXP LPC2368 <https://developer.mbed.org/platforms/mbed-LPC2368/>`_
+      - LPC2368
+      - 72 MHz
+      - 512 Kb
+      - 58 Kb
+
+    * - ``lpc2460``
+      - `NXP LPC2460 <http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/lpc-arm7-arm9-mcus/lpc-arm7-mcus/lpc2100-200-300-400/flashless-16-bit-32-bit-microcontroller-ethernet-can-isp-iap-usb-2.0-device-host-otg-external-memory-interface:LPC2460FBD208>`_
+      - LPC2460
+      - 72 MHz
+      - 64 Kb
+      - 16 Kb
+
+    * - ``lpc812``
+      - `NXP LPC800-MAX <https://developer.mbed.org/platforms/NXP-LPC800-MAX/>`_
+      - LPC812
+      - 30 MHz
+      - 16 Kb
+      - 4 Kb
+
+    * - ``lpc824``
+      - `LPCXpresso824-MAX <https://developer.mbed.org/platforms/LPCXpresso824-MAX/>`_
+      - LPC824
+      - 30 MHz
+      - 32 Kb
+      - 8 Kb
+
+    * - ``micronfcboard``
+      - `MicroNFCBoard <https://developer.mbed.org/platforms/MicroNFCBoard/>`_
+      - LPC11U34
+      - 48 MHz
+      - 64 Kb
+      - 10 Kb
+
 Outrageous Circuits
 ~~~~~~~~~~~~~~~~~~~
 
@@ -208,13 +335,47 @@ SeeedStudio
       - Flash
       - RAM
 
-    * - ``seeeduinoArchPro``
-      - `SeeedStudio Seeeduino-Arch-Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
+    * - ``seeedArchGPRS``
+      - `Seeed Arch GPRS V2 <https://www.seeedstudio.com/Arch-GPRS-V2-p-2026.html>`_
+      - LPC11U37
+      - 48 MHz
+      - 128 Kb
+      - 10 Kb
+
+    * - ``seeedArchPro``
+      - `Seeed Arch Pro <https://developer.mbed.org/platforms/Seeeduino-Arch-Pro/>`_
       - LPC1768
       - 96 MHz
       - 512 Kb
       - 64 Kb
 
+    * - ``xadow_m0``
+      - `Seeed Xadow M0 <https://developer.mbed.org/platforms/Seeed-Xadow-M0/>`_
+      - LPC11U35
+      - 48 MHz
+      - 64 Kb
+      - 10 Kb
+
+Smeshlink
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``xbed_lpc1768``
+      - `Smeshlink xbed LPC1768 <https://developer.mbed.org/platforms/xbed-LPC1768/>`_
+      - LPC1768
+      - 96 MHz
+      - 512 Kb
+      - 32 Kb
+
 Solder Splash Labs
 ~~~~~~~~~~~~~~~~~~
 
@@ -235,6 +396,26 @@ Solder Splash Labs
       - 32 Kb
       - 8 Kb
 
+SolderSplash Labs
+~~~~~~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``lpc1347``
+      - `DipCortex M3 <https://developer.mbed.org/platforms/DipCortex-M3/>`_
+      - LPC1347
+      - 72 MHz
+      - 64 Kb
+      - 12 Kb
+
 Switch Science
 ~~~~~~~~~~~~~~
 
@@ -255,6 +436,13 @@ Switch Science
       - 32 Kb
       - 4 Kb
 
+    * - ``ssci824``
+      - `Switch Science mbed LPC824 <https://developer.mbed.org/platforms/Switch-Science-mbed-LPC824/>`_
+      - LPC824
+      - 30 MHz
+      - 32 Kb
+      - 8 Kb
+
 u-blox
 ~~~~~~
 
diff --git a/docs/platforms/siliconlabsefm32.rst b/docs/platforms/siliconlabsefm32.rst
index ac92c554..c1ccc8a5 100644
--- a/docs/platforms/siliconlabsefm32.rst
+++ b/docs/platforms/siliconlabsefm32.rst
@@ -31,9 +31,6 @@ Packages
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
diff --git a/docs/platforms/ststm32.rst b/docs/platforms/ststm32.rst
index d66e1f71..3c21951e 100644
--- a/docs/platforms/ststm32.rst
+++ b/docs/platforms/ststm32.rst
@@ -28,6 +28,9 @@ Packages
     * - Name
       - Contents
 
+    * - ``framework-arduinoststm32``
+      - `Arduino Wiring-based Framework (STM32 Core) <https://github.com/rogerclarkmelbourne/Arduino_STM32>`_
+
     * - ``framework-cmsis``
       - `Vendor-independent hardware abstraction layer for the Cortex-M processor series <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php>`_
 
@@ -40,9 +43,6 @@ Packages
     * - ``framework-spl``
       - `Standard Peripheral Library for STM32 MCUs <http://www.st.com/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``tool-stlink``
       - `ST-Link <https://github.com/texane/stlink>`_
 
@@ -67,6 +67,9 @@ Frameworks
     * - Name
       - Description
 
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences.
+
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices.
 
@@ -162,6 +165,48 @@ Generic
       - 64 Kb
       - 20 Kb
 
+    * - ``genericSTM32F103C8``
+      - `STM32F103C8 (20k RAM. 64k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103c8.html>`_
+      - STM32F103C8
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103CB``
+      - `STM32F103CB (20k RAM. 128k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103cb.html>`_
+      - STM32F103CB
+      - 72 MHz
+      - 128 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103R8``
+      - `STM32F103R8 (20k RAM. 64 Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103r8.html>`_
+      - STM32F103R8
+      - 72 MHz
+      - 64 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103RB``
+      - `STM32F103RB (20k RAM. 128k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rb.html>`_
+      - STM32F103RB
+      - 72 MHz
+      - 128 Kb
+      - 20 Kb
+
+    * - ``genericSTM32F103RC``
+      - `STM32F103RC (48k RAM. 256k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103rc.html>`_
+      - STM32F103RC
+      - 72 MHz
+      - 256 Kb
+      - 48 Kb
+
+    * - ``genericSTM32F103RE``
+      - `STM32F103RE (64k RAM. 512k Flash) <http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f1-series/stm32f103/stm32f103re.html>`_
+      - STM32F103RE
+      - 72 MHz
+      - 512 Kb
+      - 64 Kb
+
 MultiTech
 ~~~~~~~~~
 
@@ -175,6 +220,13 @@ MultiTech
       - Flash
       - RAM
 
+    * - ``mts_mdot_f405rg``
+      - `MultiTech mDot <https://developer.mbed.org/platforms/MTS-mDot-F411/>`_
+      - STM32F411RET6
+      - 100 MHz
+      - 512 Kb
+      - 128 Kb
+
     * - ``mts_mdot_f411re``
       - `MultiTech mDot F411 <https://developer.mbed.org/platforms/MTS-mDot-F411/>`_
       - STM32F411RET6
@@ -182,6 +234,26 @@ MultiTech
       - 512 Kb
       - 128 Kb
 
+Olimex
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``maple``
+      - `Olimexino STM32 <https://www.olimex.com/Products/Duino/STM32/OLIMEXINO-STM32/>`_
+      - STM32F103RB_MAPLE
+      - 72 MHz
+      - 128 Kb
+      - 16.6015625 Kb
+
 ST
 ~~
 
@@ -251,6 +323,13 @@ ST
       - 1024 Kb
       - 384 Kb
 
+    * - ``disco_f746ng``
+      - `ST 32F746GDISCOVERY <http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f746gdiscovery.html>`_
+      - STM32F746NGH6
+      - 216 MHz
+      - 1024 Kb
+      - 320 Kb
+
     * - ``disco_l053c8``
       - `ST 32L0538DISCOVERY <http://www.st.com/web/en/catalog/tools/PF260319>`_
       - STM32L053C8T6
@@ -321,6 +400,13 @@ ST
       - 128 Kb
       - 20 Kb
 
+    * - ``nucleo_f207zg``
+      - `ST Nucleo F207ZG <https://developer.mbed.org/platforms/ST-Nucleo-F207ZG/>`_
+      - STM32F207ZGT6
+      - 120 MHz
+      - 1024 Kb
+      - 128 Kb
+
     * - ``nucleo_f302r8``
       - `ST Nucleo F302R8 <https://developer.mbed.org/platforms/ST-Nucleo-F302R8/>`_
       - STM32F302R8T6
@@ -370,6 +456,13 @@ ST
       - 512 Kb
       - 128 Kb
 
+    * - ``nucleo_f429zi``
+      - `ST Nucleo F429ZI <https://developer.mbed.org/platforms/ST-Nucleo-F429ZI/>`_
+      - STM32F429ZIT6
+      - 180 MHz
+      - 2048 Kb
+      - 256 Kb
+
     * - ``nucleo_f446re``
       - `ST Nucleo F446RE <https://developer.mbed.org/platforms/ST-Nucleo-F446RE/>`_
       - STM32F446RET6
@@ -377,6 +470,34 @@ ST
       - 512 Kb
       - 128 Kb
 
+    * - ``nucleo_f446ze``
+      - `ST Nucleo F446ZE <https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/>`_
+      - STM32F446ZET6
+      - 180 MHz
+      - 512 Kb
+      - 128 Kb
+
+    * - ``nucleo_f746zg``
+      - `ST Nucleo F746ZG <https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/>`_
+      - STM32F746ZGT6
+      - 216 MHz
+      - 1024 Kb
+      - 320 Kb
+
+    * - ``nucleo_f767zi``
+      - `ST Nucleo F767ZI <https://developer.mbed.org/platforms/ST-Nucleo-F767ZI/>`_
+      - STM32F746ZGT6
+      - 216 MHz
+      - 2048 Kb
+      - 512 Kb
+
+    * - ``nucleo_l011k4``
+      - `ST Nucleo L011K4 <https://developer.mbed.org/platforms/ST-Nucleo-L011K4/>`_
+      - STM32L011K4T6
+      - 32 MHz
+      - 16 Kb
+      - 2 Kb
+
     * - ``nucleo_l031k6``
       - `ST Nucleo L031K6 <https://developer.mbed.org/platforms/ST-Nucleo-L031K6/>`_
       - STM32L031K6T6
@@ -405,6 +526,13 @@ ST
       - 512 Kb
       - 80 Kb
 
+    * - ``nucleo_l432kc``
+      - `ST Nucleo L432KC <https://developer.mbed.org/platforms/ST-Nucleo-L432KC/>`_
+      - STM32L432KCU6
+      - 80 MHz
+      - 256 Kb
+      - 64 Kb
+
     * - ``nucleo_l476rg``
       - `ST Nucleo L476RG <https://developer.mbed.org/platforms/ST-Nucleo-L476RG/>`_
       - STM32L476RGT6
@@ -426,7 +554,7 @@ SeeedStudio
       - RAM
 
     * - ``seeedArchMax``
-      - `SeeedStudio Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
+      - `Seeed Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
       - STM32F407VET6
       - 168 MHz
       - 512 Kb
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index ef95fc5b..03bc41c9 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -34,9 +34,6 @@ Packages
     * - ``framework-mbed``
       - `mbed Framework <http://mbed.org>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``tool-teensy``
       - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
 
@@ -123,6 +120,20 @@ Teensy
       - 256 Kb
       - 64 Kb
 
+    * - ``teensy35``
+      - `Teensy 3.5 <https://www.pjrc.com>`_
+      - MK64FX512
+      - 120 MHz
+      - 512 Kb
+      - 192 Kb
+
+    * - ``teensy36``
+      - `Teensy 3.6 <https://www.pjrc.com>`_
+      - MK66FX1M0
+      - 180 MHz
+      - 1024 Kb
+      - 256 Kb
+
     * - ``teensylc``
       - `Teensy LC <http://www.pjrc.com/teensy/teensyLC.html>`_
       - MKL26Z64
diff --git a/docs/platforms/timsp430.rst b/docs/platforms/timsp430.rst
index 2218f8c8..91ab1e8b 100644
--- a/docs/platforms/timsp430.rst
+++ b/docs/platforms/timsp430.rst
@@ -37,9 +37,6 @@ Packages
     * - ``tool-mspdebug``
       - `MSPDebug <http://mspdebug.sourceforge.net/>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-timsp430``
       - `msp-gcc <http://sourceforge.net/projects/mspgcc/>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
diff --git a/docs/platforms/titiva.rst b/docs/platforms/titiva.rst
index 2dae6a51..ff67ab16 100644
--- a/docs/platforms/titiva.rst
+++ b/docs/platforms/titiva.rst
@@ -37,9 +37,6 @@ Packages
     * - ``tool-lm4flash``
       - `Flash Programmer <http://www.ti.com/tool/lmflashprogrammer>`_
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gccarmnoneeabi``
       - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
 
diff --git a/docs/platforms/windows_x86.rst b/docs/platforms/windows_x86.rst
index a35f48d6..690c955b 100644
--- a/docs/platforms/windows_x86.rst
+++ b/docs/platforms/windows_x86.rst
@@ -28,8 +28,5 @@ Packages
     * - Name
       - Contents
 
-    * - ``tool-scons``
-      - `SCons software construction tool <http://www.scons.org>`_
-
     * - ``toolchain-gccmingw32``
       - `MinGW <http://www.mingw.org>`_
\ No newline at end of file
diff --git a/scripts/docspregen.py b/scripts/docspregen.py
index f977c49a..832e5291 100644
--- a/scripts/docspregen.py
+++ b/scripts/docspregen.py
@@ -95,7 +95,7 @@ Packages
     * - Name
       - Contents""")
     for name in sorted(packagenames):
-        assert name in API_PACKAGES
+        assert name in API_PACKAGES, name
         contitems = [
             "`{name} <{url}>`_".format(**item) for item in API_PACKAGES[name]
         ]