Create a branch to fix links on.


[SVN r41573]
Merge from trunk, finally.


[SVN r41817]
Merge.

[SVN r42338]
Merge.

[SVN r42905]
Merge.

[SVN r43063]
Hopefully fix some more links.

[SVN r43219]