Merged revisions 106842 via svnmerge from