Merged revisions 68450 via svnmerge from