Merged revisions 32605 via svnmerge from