Merged revisions 25123 via svnmerge from