From: Angus Gratton <angus@espressif.com>
Date: Tue, 5 Jun 2018 03:51:35 +0000 (+0800)
Subject: Merge branch 'bugfix/github_prs' into 'master'
X-Git-Tag: v3.1-beta1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2ff235bd003bf3dcb114ff7efe3e0c605c4dd9f;p=esp-idf

Merge branch 'bugfix/github_prs' into 'master'

Merge some small fixes from Github

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

b2ff235bd003bf3dcb114ff7efe3e0c605c4dd9f