Merged revisions 193955 via svnmerge from