From: Angus Gratton <angus@espressif.com>
Date: Mon, 12 Nov 2018 01:14:35 +0000 (+0800)
Subject: Merge branch 'bugfix/multiple_github_pr' into 'master'
X-Git-Tag: v3.3-beta1~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3685d325d8027efad67f0e89074110bce22be272;p=esp-idf

Merge branch 'bugfix/multiple_github_pr' into 'master'

Multiple github PR's

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

3685d325d8027efad67f0e89074110bce22be272