Merged revisions 76211 via svnmerge from