Merge branch 'vendor/LIBPCAP' (early part)