Merged revisions 106328 via svnmerge from