From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 10 Nov 2017 03:13:04 +0000 (+0800)
Subject: Merge branch 'bugfix/from_github' into 'master'
X-Git-Tag: v3.1-dev~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1f60309219ecabfb6dd4307ab4e60f272b89372;p=esp-idf

Merge branch 'bugfix/from_github' into 'master'

Bug fixes from Github

See merge request !1487
---

d1f60309219ecabfb6dd4307ab4e60f272b89372