Merged revisions 43774 via svnmerge from