Merged revisions 43492 via svnmerge from