Merged revisions 105674 via svnmerge from