Merged revisions 26050 via svnmerge from