Merged revisions 25518 via svnmerge from