Merged revisions 186059 via svnmerge from