Merged revisions 43697 via svnmerge from