Merge pull request #2864 from Memphiz/mdns