Merged revisions 170836 via svnmerge from