Merged revisions 43003 via svnmerge from