Merged revisions 68211 via svnmerge from