Merged revisions 68370 via svnmerge from