Merged revisions 101989 via svnmerge from