Merged revisions 166297 via svnmerge from