Merge remote branch 'upstream/master'

diff --combined tests/TESTLIST
index 8d638ae81d4660a204f3608440cb36d90fc34b21,408034316cd2b10f1e6709a16f9e575ac8e51396..90157dbd9e5b7f8eb73721dbd3c09748682dd52c
--- 1/tests/TESTLIST
--- 2/tests/TESTLIST
+++ b/tests/TESTLIST
@@@ -66,14 -66,17 +66,20 @@@ babel_auth      babel_auth.pcap        
  pppoe           pppoe.pcap             pppoe.out       -t
  
  # ICMPv6
- icmpv6          icmpv6.pcap             icmpv6.out      -t -vv -c1
+ icmpv6          icmpv6.pcap             icmpv6.out      -t -vv
  
  # SPB tests
  spb               spb.pcap                spb.out -t
  
 +# SPB BPDUv4 tests
 +spb_bpduv4      spb_bpduv4.pcap       spb_bpduv4.out -t
 +
  # RIP tests
  ripv1v2         ripv1v2.pcap            ripv1v2.out     -t -v
  ripv2_auth      ripv2_auth.pcap         ripv2_auth.out  -t -v
+ 
+ # DHCPv6 tests
+ dhcpv6-aftr-name      dhcpv6-AFTR-Name-RFC6334.pcap   dhcpv6-AFTR-Name-RFC6334.out    -t -v
+ dhcpv6-ia-na  dhcpv6-ia-na.pcap       dhcpv6-ia-na.out        -t -v
+ dhcpv6-ia-pd  dhcpv6-ia-pd.pcap       dhcpv6-ia-pd.out        -t -v
+ dhcpv6-ia-ta  dhcpv6-ia-ta.pcap       dhcpv6-ia-ta.out        -t -v