Merged revisions 82448 via svnmerge from