Merged revisions 186832 via svnmerge from