Merge remote-tracking branch 'stevee/snort-update' into next