Merged revisions 44312 via svnmerge from