Merged revisions 84359-84360 via svnmerge from