Merge remote-tracking branch 'origin/peerdiscovery'

Conflicts:
	.gitignore