Merge pull request #6377 from annando/ostatus-notice