Create a branch to fix links on.
Another try. Turns out I had the wrong source branch.
Merge from trunk, finally.
Merge.
Merge.
Merge.
Merge.