Merged revisions 44921 via svnmerge from