Merged revisions 44055 via svnmerge from