Merged revisions 118509 via svnmerge from