support sunetmask, such as 192.168.0.8/29
Merge remote-tracking branch 'origin/master'