Merged revisions 68814 via svnmerge from