Merged revisions 195991 via svnmerge from