Merged revisions 68157 via svnmerge from