Create a branch to fix links on.
Merge from trunk, finally.
Merge.
Merge from trunk.
Hopefully fix some more links.
Fix some link errors due to replacing // with #.