Merged revisions 71096 via svnmerge from