Fixed P2P bug. User list not updating properly.
Merge remote-tracking branch 'upstream/master'