Merged revisions 89416 via svnmerge from