Merged revisions 60847 via svnmerge from