Merged revisions 81226 via svnmerge from