Merged revisions 175825 via svnmerge from