Fix peers config
Merge branch 'master' into ports

Conflicts:
	ifw