Merge branch 'bugfix/small_fixes_github' into 'master'
authorAngus Gratton <angus@espressif.com>
Wed, 3 Jan 2018 05:36:03 +0000 (13:36 +0800)
committerAngus Gratton <angus@espressif.com>
Wed, 3 Jan 2018 05:36:03 +0000 (13:36 +0800)
Some small fixes from Github

See merge request !1737


Trivial merge