Merge remote-tracking branch 'mfischer/snort' into next