fix distribution of like deletes
Merge branch 'master' into xmpp