From: Jeroen Domburg <jeroen@espressif.com>
Date: Thu, 5 Apr 2018 01:54:17 +0000 (+0800)
Subject: Merge branch 'feature/get-started-20180130' into 'master'
X-Git-Tag: v3.1-beta1~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f586f5e690e687f8db219a8b509bbf483fc416d6;p=esp-idf

Merge branch 'feature/get-started-20180130' into 'master'

Feature/get started 20180130

See merge request idf/esp-idf!1898
---

f586f5e690e687f8db219a8b509bbf483fc416d6