Merged revisions 24496 via svnmerge from