Merged revisions 43454 via svnmerge from