Merge branch 'arduino:master' into rewriteIPAddress

Author: safocl

Diff for: api/IPAddress.h

@@ -95,7 +95,7 @@ class IPAddress : public Printable {
     virtual size_t printTo(Print& p) const;
     String toString() const;
 
-    IPType type() { return _type; }
+    IPType type() const { return _type; }
 
     friend class UDP;
     friend class Client;