Debug code for peer discovery.
Merge branch 'downloadman' into develop