Merged revisions 107713 via svnmerge from