Merged revisions 118163 via svnmerge from