From: Angus Gratton <angus@espressif.com>
Date: Tue, 10 Apr 2018 01:19:19 +0000 (+0800)
Subject: Merge branch 'bugfix/small_fixes_from_github' into 'master'
X-Git-Tag: v3.1-beta1~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bfef060baeedd0c0269e60d9a2def0c0d4a2e15;p=esp-idf

Merge branch 'bugfix/small_fixes_from_github' into 'master'

Bugfix/small fixes from github

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

2bfef060baeedd0c0269e60d9a2def0c0d4a2e15