Merged revisions 21638 via svnmerge from