Merged revisions 21597 via svnmerge from