Merge branch 'master' into master

1 files changed, 4 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Net/SocketReceiveResult.cs b/MediaBrowser.Model/Net/SocketReceiveResult.cs
index 8c394f7c7..cd7a2e55f 100644
--- a/MediaBrowser.Model/Net/SocketReceiveResult.cs
+++ b/MediaBrowser.Model/Net/SocketReceiveResult.cs
@@ -1,3 +1,5 @@
+using System.Net;
+
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
@@ -18,7 +20,7 @@ namespace MediaBrowser.Model.Net
         /// <summary>
         /// The <see cref="IpEndPointInfo"/> the data was received from.
         /// </summary>
-        public IpEndPointInfo RemoteEndPoint { get; set; }
-        public IpAddressInfo LocalIPAddress { get; set; }
+        public IPEndPoint RemoteEndPoint { get; set; }
+        public IPAddress LocalIPAddress { get; set; }
     }
 }