Merged revisions 174082 via svnmerge from