Merged revisions 72125 via svnmerge from