Merged revisions 43913 via svnmerge from