Merged revisions 122046 via svnmerge from