Re-added removed code. Sigh.
Merge pull request #185 from eaescob/mdns-fixes

Re-added removed code. Sigh.
Merge remote-tracking branch 'upstream/master'