Merged revisions 43314 via svnmerge from