Merged revisions 44628 via svnmerge from