Merged revisions 49712 via svnmerge from