fr33domlover/vervis
peers/master
I've cherry-picked this because there was a merge conflict. Take a look that I've added the correct details.
I've cherry-picked this because there was a merge conflict. Take a look that I've added the correct details.