Merge pull request #655 from hnyman/nat6