Merged revisions 71522 via svnmerge from