Merged revisions 117081 via svnmerge from