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