Merged revisions 118954 via svnmerge from