Merged revisions 175311 via svnmerge from