Merge pull request #6342 from annando/notices