Merged revisions 107352 via svnmerge from