Merged revisions 25520 via svnmerge from