Merged revisions 49890 via svnmerge from