Merged revisions 168716 via svnmerge from