Merge pull request #9152 from annando/fix-notifications