Merged revisions 71796 via svnmerge from