Tighten up some of the ip translations.
Merge branch '20130421-ip-provider' into 20130427-udp-provider