From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 7 Jul 2017 03:13:43 +0000 (+0800)
Subject: Merge branch 'cherry_pick_to_release_v2.1' into 'release/v2.1'
X-Git-Tag: v2.1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa7d3f38fca68419fa5d412dca50dc47c50d70e1;p=esp-idf

Merge branch 'cherry_pick_to_release_v2.1' into 'release/v2.1'

Update release/v2.1 with some bug fixes

See merge request !952
---

fa7d3f38fca68419fa5d412dca50dc47c50d70e1