Merged revisions 118465 via svnmerge from