master
464xlat: delete SNATed conntracks on interface teardown
6in4: remove 6in4 tunnel delete workaround (FS#3690)
package: avoid the use of eval to parse ipcalc.sh output
package: drop PKG_VERSION for purely local packages
map: rename type to maptype (FS#3287)
odhcp6c: add skpriority option
thc-ipv6: update to 3.8