Merged revisions 58946 via svnmerge from