Merged revisions 23638 via svnmerge from