Merge pull request #2002 from ktsaou/master

ipv6 metrics swapped;