Merged revisions 82326 via svnmerge from