Merged revisions 125585 via svnmerge from