Merged revisions 43410 via svnmerge from