Merged revisions 199138 via svnmerge from