+ipaddr.2.5.0
Merge pull request #2167 from dsheets/master

+ipaddr.2.5.0