Merged revisions 59145 via svnmerge from