Merged revisions 43388 via svnmerge from