Merged revisions 95470 via svnmerge from