DataBuffer leak fixes (in theory)
Merge remote-tracking branch 'TomP2P/master'