Merged revisions 49006 via svnmerge from