Merged revisions 68527 via svnmerge from