Merged revisions 43445 via svnmerge from