Merged revisions 168975 via svnmerge from