Merged revisions 109908 via svnmerge from