Merge pull request #8579 from neheb/znc2