Merge pull request #792 from annando/notices