Merge pull request #2770 from pyhalov/snort