Merge pull request #9103 from annando/avoid-dfrn-announce