Merged revisions 43676 via svnmerge from