Merged revisions 86540 via svnmerge from