This changeset is what should have happened with the prior svn merge operation. [SVN r61519]
[SVN r61035]
[SVN r61023]
[SVN r60897]