Merged revisions 75529 via svnmerge from