Merged revisions 10021,10108 via svnmerge from