Merged revisions 43422 via svnmerge from