Merged revisions 170147 via svnmerge from