Merged revisions 43978 via svnmerge from