Merged revisions 85958 via svnmerge from