Merged revisions 23580 via svnmerge from