Merge pull request #8855 from annando/diaspora-plink