Merge pull request #1001 from annando/notice