Merged revisions 43700 via svnmerge from