Merged revisions 59724 via svnmerge from