Merged revisions 166093 via svnmerge from