Merged revisions 72852 via svnmerge from