local commit
Merged and resolved conflicts
Added addon v2.6.58

- Removed upnp and zroconf