Merged revisions 88719 via svnmerge from