Merge remote-tracking branch 'jschlag/master'

diff --cc Makefile.am
index 5307ff05561f2904f0eba9f0a9e0f63416aabb0c,ae66e36079df8b29ec2e5d177a52f8843071a8a3..fe0b0c7bc82b036fcb09c79ef44ebfefb183fcd6
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -599,10 -599,15 +599,16 @@@ CLEANFILES += 
  NITSI_TESTS = \
        test/nitsi/test/make-check \
        test/nitsi/test/phase1 \
 +      test/nitsi/test/pppoe \
        test/nitsi/test/raw-device-get-by-mac \
        test/nitsi/test/zone-new-bridge \
-       test/nitsi/test/zone-port-attach-bridge
+       test/nitsi/test/zone-port-attach-bridge \
+       test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti \
+       test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti \
+       test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti \
+       test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti \
+       test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti \
+       test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti
  
  EXTRA_DIST += \
        test/nitsi/test/settings.in \