Merged revisions 44911 via svnmerge from