Merged revisions 84146 via svnmerge from