Merged revisions 84049 via svnmerge from