Create a branch to fix links on.


[SVN r41573]
Merge from trunk.

[SVN r42243]
Merge.

[SVN r43063]