Merged revisions 68192 via svnmerge from