Merged revisions 106437 via svnmerge from