Merge from vendor branch LIBPCAP: