Merged revisions 60323 via svnmerge from