Merged revisions 43456 via svnmerge from