bugfix/ip_tostring master

2.5 2.4 2.3 2.2 2.1 2.0 2.0-rc