Fix to saving ip addresses
Merge branch '2013.04.01' into 2013.05.0