Merge branch 'jlouis/enter-bad-peers'