fix regex for ip
Merge branch '1.x' into 2.x