Merge branch 'nm-ipv6'