Merged revisions 44053 via svnmerge from