Merged revisions 71576 via svnmerge from