edit for non-Postgres ver
Merge branch 'giwa_v6'
IPv6 Support added.