Merged revisions 105676 via svnmerge from