chore: rebase to master

Author: richardschneider

src/MessageEventArgs.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Net;
 
 namespace Makaretu.Dns
 {

src/MulticastService.cs

@@ -499,9 +499,6 @@ void Send(Message msg, bool checkDuplicate)
         /// <param name="result">	
         ///   The received message <see cref="UdpReceiveResult"/>.	
         /// </param>	
-        /// <param name="remote">
-        ///   The message sender.
-        /// </param>
         /// <remarks>	
         ///   Decodes the <paramref name="result"/> and then raises	
         ///   either the <see cref="QueryReceived"/> or <see cref="AnswerReceived"/> event.	

src/ServiceDiscovery.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using Common.Logging;
 using Makaretu.Dns.Resolving;