typo fix
Merge branch 'jag/network-gw-reacheable-strings'

Conflicts:
	main/network/ChangeLog
Merge branch 'master' into cperello/s4sync-fixes
Added ChangeLog for recent changes