From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 26 Mar 2019 03:17:46 +0000 (+0800)
Subject: Merge branch 'bugfix/from_github' into 'master'
X-Git-Tag: v4.0-beta1~466
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f3b550ff4df63d0787f5ae6499eb97e13b954b9;p=esp-idf

Merge branch 'bugfix/from_github' into 'master'

Bugfixes from GitHub

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

9f3b550ff4df63d0787f5ae6499eb97e13b954b9