Merged revisions 170979 via svnmerge from