Merged revisions 174282 via svnmerge from