Merged revisions 106606 via svnmerge from