Merge pull request #268 from dedeckeh/pr_nat46_upstep