Merged revisions 61072 via svnmerge from