Merged revisions 32582 via svnmerge from