Merging in the ipaddr update changes.