Create a branch to fix links on.


[SVN r41573]
Merge from trunk, finally.


[SVN r41817]
Merge.

[SVN r42905]