Merged revisions 44982 via svnmerge from