Merge branch 'ipv6-firewire'