Merged revisions 170568 via svnmerge from