Merged revisions 68027 via svnmerge from