Merged revisions 195688 via svnmerge from