Merged revisions 76139 via svnmerge from