Merged revisions 119404 via svnmerge from