Merged revisions 175294 via svnmerge from