Merged revisions 196596 via svnmerge from