Merged revisions 49009 via svnmerge from