Merged revisions 105568 via svnmerge from