Merged revisions 71362 via svnmerge from