djcb Merge pull request #71 from zallison/2020-zeroconf