Merged revisions 60214 via svnmerge from