Merged revisions 107646 via svnmerge from