Create a branch to fix links on.
Fix the navbar links.
Merge from trunk, finally.
Merge from trunk.
Merge.
Merge.