Merged revisions 86545 via svnmerge from