Merged revisions 44393 via svnmerge from