Better check for ipv6 presence before disabling it
Merge branch 'jag/network-disable-ipv6'

Conflicts:
	main/network/ChangeLog