Merged revisions 85552 via svnmerge from