Mixture of an upgrade and some commented out ESP_LOG calls.
Authored by: dannybackx 2019-02-16
Parent: [r170]
Child: [r172]