From: Angus Gratton <angus@espressif.com>
Date: Mon, 11 Dec 2017 04:51:41 +0000 (+0800)
Subject: Merge branch 'bugfix/minor_fixes_github' into 'master'
X-Git-Tag: v3.1-beta1~550
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcf94f218901114fd59b95bcc2742079ebc7fa7e;p=esp-idf

Merge branch 'bugfix/minor_fixes_github' into 'master'

Minor fixes from github

See merge request !1638
---

dcf94f218901114fd59b95bcc2742079ebc7fa7e