Create a branch to fix links on.
Merge from trunk, finally.
Merge.
Merge.
Merge.
Hopefully fix some more links.