Merged revisions 118052 via svnmerge from