Merged revisions 43383 via svnmerge from