Merged revisions 43019 via svnmerge from