Merged revisions 24837 via svnmerge from