Merge pull request #1326 from Psycho-Pirate/peers