Merged revisions 185952 via svnmerge from