Merged revisions 43466 via svnmerge from