Merged revisions 107637 via svnmerge from