Merged revisions 81826 via svnmerge from