Merged revisions 235940 via svnmerge from