bitcoin/bitcoin — pull request #4390 by Diapolo (2014-06-22 18:20:48+00:00)
Title: incremental net cleanup 2

I'm going to split of some changes from #4348 to make review easier and hopefully merging faster :).