Merged revisions 76156 via svnmerge from