#1212 Suppressing display of IP addresses on map except when in dev mode
Merge branch '1212'