Merge pull request #820 from annando/statusnet-notice