Merged revisions 76132 via svnmerge from