Merged revisions 71657 via svnmerge from