Merged revisions 43707 via svnmerge from