Merged revisions 82444 via svnmerge from